marathon-template 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e29c955ccac0d990fe433cc84608b6f31523a36
-  data.tar.gz: f577be40ab909f87099ae0f9dbfddd81ec557bff
+  metadata.gz: bdd4964070763e5f45f9584f345eaa18876a94f5
+  data.tar.gz: 69f321dcd4e861f6b393f34637a922ce959b9066
 SHA512:
-  metadata.gz: cf3c95ba818005ead994c87a6868b372cecb3d89561e965e472e7903cb26ca464feb6f2145a803333f57fbc817601b2a042888c66fbd25af9a365c3620ecf273
-  data.tar.gz: ceb3beca0075f8c45da804ce0a434871f0d2b5fed6cf8ef21f6967e51d3284b19b5d7182c847dfe5adf31857bd6be4a6692153a83418eea3f87578559a4f134f
+  metadata.gz: 59bfa4c3a5c882ce24ad9531a919d4f07fc8d55dbee9e3e68e91f85f27054b405322976586b535179f3223a979c8a768c1733f7d70b986a03812a365394a3864
+  data.tar.gz: 5e4d4c3d3ccbde1bb1ec70e9c0d7de49826605b16797c609dc4f6af7904d7dccf71331ed1abfa0bbf9bc3625935a8416e9657ee42b2c4ad0e3d45f676b047a9f

data/lib/marathon-template/deploy.rb

@@ -128,34 +128,38 @@ module Marathon_template
     end
 
     def self.get_servers(app_name)
-      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)
+      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?"
+        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
-          abort LOG.error "Failed connecting to #{marathon_app}, response code: #{response.code}"
+          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
         end
+        return_hash
+      rescue Exception => e
+        e.message
       end
-      return_hash
     end
 
     def self.test_haproxy_dir

data/lib/marathon_template.rb

@@ -41,7 +41,6 @@ module Marathon_template
     Marathon_template::Cron.add
     
   rescue Exception => e
-    puts e.backtrace
-    puts e.message
+    puts "marathon-template failed to execute." 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marathon-template
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jeff Malnick