marathon-template 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803d797b06375a5a01e76ceb30ceec4bba578e20
-  data.tar.gz: 9fa87c89079f629e9683d4d117e7d8541cd46b29
+  metadata.gz: 68b6f9cdb9860cd1b0311093eab0718f3e64546d
+  data.tar.gz: 36b0e90716e2fb365618f47aba97a21abe944609
 SHA512:
-  metadata.gz: 2715b6a51e65767779b181e89aa3ddd5a5d03530e061747ee37f28284aff34b8600d8f73f6e17416a0ebab1a967180addd2c46159f4237a912226e5d5ddea376
-  data.tar.gz: b19ac5c0995384ee8f59568a60962350ef663d4b017d574f32b1e7f16304e8e8e6c96f4502af1db88e31efcee52cb83bd050fc177921213c00c85631d953314e
+  metadata.gz: 04afaedf48626b35ecce06a296e5c8a7473d84768be74f664cd30a21976b3ac1a126f84596ac1627d9480d5d0677b63d5956d47e6fbad0ffa1c6259f9fa3eb8a
+  data.tar.gz: e82b4dfd4e6f96ff9172c0790eba89ce53a4267ed36c090d774220a707be5c658a8ef5b141c6f058ad46fd50ee75061cdffdc441a2518132a84dddbccc1b575c

data/lib/marathon-template/deploy.rb

@@ -106,7 +106,10 @@ module Marathon_template
                 app_name  = values['app_name']
                 options   = values['options']
                 servers   = get_servers(app_name)
-                if values['management_port']
+                if servers['404'] #== '404' 
+        LOG.info servers
+                  LOG.info "#{app_name} was not found in Marathon, skipping but continuing to manage the haproxy.cfg"
+                elsif values['management_port']
                   LOG.info "#{app_name}: #{servers}"
                   servers.each do |host, port|
                     f.write "\tserver #{app_name}-#{host.split('_').last} #{host.split('_').first}:#{port[0]} #{options} port #{port[1]}\n"
@@ -134,39 +137,38 @@ module Marathon_template
     end
 
     def self.get_servers(app_name)
-      begin
-        LOG.info "Getting host and port assignments for #{app_name}..."
-        marathon_app      = "#{CONFIG[:marathon]}/v2/apps/#{app_name}"
-        encoded_uri       = URI.encode(marathon_app.to_s)
-        uri               = URI.parse(encoded_uri)
-        http              = Net::HTTP.new(uri.host, uri.port)
-        request           = Net::HTTP::Get.new(uri.request_uri)
-        response          = http.request(request)
-
-        if response.code == '200'
-          return_hash = Hash.new 
-          json        = JSON.parse(response.body)
-          tasks       = json['app']['tasks']
-          tasks.each_with_index do |task, i|
-            LOG.info "Found host #{task['host']} and port #{task['ports']}"
-            return_hash["#{task['host']}_#{i}"] = task['ports']
-  #          if task['ports'].length == 1
-  #+             LOG.info "Found host #{task['host']} and port #{task['ports']}"
-  #              return_hash[i] = { task['host'] => task['port'] }
-  #              return_array << "#{task['host']}:#{task['ports'][1]}"
-          end
-        else
-          if response.code == '404'
-            abort LOG.error "Failed connecting to #{marathon_app}, response code: #{response.code}\n Are you sure the app #{app_name} exists?"
-          else
-            abort LOG.error "Failed connecting to #{marathon_app}, response code: #{response.code}"
-          end
+      LOG.info "Getting host and port assignments for #{app_name}..."
+      # Setup the URI for marathon and check it before moving on
+      marathon_app      = "#{CONFIG[:marathon]}/v2/apps/#{app_name}"
+      unless URI.parse(URI.encode(marathon_app)) 
+        abort LOG.info "The URI for #{marathon_app} doesn't look right." 
+      end
+      LOG.info "Querying #{marathon_app}"
+      # Parse the URI for reals and make a request
+      encoded_uri       = URI.encode(marathon_app.to_s)
+      uri               = URI.parse(encoded_uri)
+      http              = Net::HTTP.new(uri.host, uri.port)
+      request           = Net::HTTP::Get.new(uri.request_uri)
+      response          = http.request(request)
+      return_hash       = Hash.new 
+      # If we get a 200, lets return the servier hosts and ports assignments
+      if response.code == '200'
+        json        = JSON.parse(response.body)
+        tasks       = json['app']['tasks']
+        tasks.each_with_index do |task, i|
+          LOG.info "Found host #{task['host']} and port #{task['ports']}"
+          return_hash["#{task['host']}_#{i}"] = task['ports']
         end
-        return_hash
-      rescue Exception => e
-        e.message
-        e.backtrace
+      # If we don't then do not blow up, simply return not found and move on. This way usable servers still get proxied. 
+      elsif response.code == '404'
+        LOG.warn "Response code: #{response.code}"
+        LOG.warn "Are you sure the app #{app_name} exsts?"
+        return_hash[response.code] = 'not_found' 
+        LOG.info return_hash
+      else
+        abort LOG.error "Got #{response.code} which is neither 404 or 200"
       end
+      return_hash
     end
 
     def self.test_haproxy_dir

data/lib/marathon_template.rb

@@ -42,5 +42,7 @@ module Marathon_template
     
   rescue Exception => e
     puts "marathon-template failed to execute." 
+    puts e.message
+    puts e.backtrace
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-template
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jeff Malnick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: