vcd client no longer returns nil on 404

infochimps-labs · Sep 20, 2013 · db67d3d · db67d3d
1 parent f170661
commit db67d3d
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/lib/wukong-deploy/deploy_pack.rb b/lib/wukong-deploy/deploy_pack.rb
@@ -190,13 +190,7 @@ def self.read_remote_settings
       end
       topic = "deploy_packs.#{name}"
       remote_settings = vayacondios_client.get(topic)
-      if remote_settings
+      settings.merge(remote_settings) if remote_settings.success?
-        if remote_settings.is_a?(Hash)
-          settings.merge(remote_settings)
-        else
-          Wukong::Log.warn("Remote settings for <#{topic}> must be a Hash.  Got: #{remote_settings}")
-        end
-      end
     end
 
   end