marathon_deploy 0.1.45 → 0.1.46

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg4ZmU2NTEyZDJhMGQwNDY3YjlhNGU1YTI0ZWUxNGQxNGMyYzk3Mw==
+    YjMyZWMxN2MyZDhlYjUzNTUwMWI5NTU3Y2Q3OTFlNDJjMDk3NDY0NA==
   data.tar.gz: !binary |-
-    OGNkZmYxZjNkM2E4MmNkMDdiYmViYjQ5ZmY3MTE1YTY1MjIyMzg0Yw==
+    OWFlYjI5NTgwOGY4YjBhNThkZWM2NDdjMDE1OGFmZDkxOGU2NjA4NA==
 SHA512:
   metadata.gz: !binary |-
-    YjFiODcwZjlhMjllOTYwMWVkNmRjYmZkNzQwYmQ5YWFiNDI2YTcyZTg5MjZk
-    MjBlMjgwMjRiNjI5MTYyNDA1YWQ1ZjA3OTA0ZWIzOGRmNThhZjYwZTlhNzEx
-    OTI2Y2RhYWRhN2M4OWM0ZTBmMTNlNWFlN2RjMjIzMDIyOTI0MmM=
+    MWUyMjE2NDQxNTNmN2M1MDgyYmQzNmMzNjVhMjg4ZDFkOGQ2ODlmMjBhMjhk
+    MWVjZjdkMGIwZjJkMmY0MzIzYjg1ZTY0MjM4ZGUxZDBjYjk3Zjc3NzJmMjEz
+    YTFkZWE4MWU4YTFiNDU4NjU2NGQ1NTAzZWE1ZmE5OWNhYjYxMjk=
   data.tar.gz: !binary |-
-    MzU3ZjdlYTIzZDUwNTNhMjQ5ZDcwYzczMGRmZjZhNWFjMGVkNGEyMTA4ZmU1
-    MmRmOGM1NjQ5ZmViZGFjZjI4OTJmNmMzOGJkZTZmMjBkMzA5MjVkMWRmYzA0
-    ZDAwNDI3YTBjY2VjYTZlOGY4ZDgwNTRkMzljOWEzZmRmMjBlNTc=
+    NjJjOWJmMTk0YzcyMzNlMDYzYjBjMDk5NWM4MWMzNGJjNzhiYjg4YWRhNzUz
+    OWQ1MzQ4MzQxMTRjMTQyMzNlZTZlZTRiMDllOWExYmY3Y2U1MzQ0ZDNlNTEx
+    MWI4NTA2NGNmMzYyYTQxYzk3N2E3MGRjYzc4ZTQ3MWJlYjM2MDc=

data/lib/marathon_deploy/deployment.rb

@@ -60,7 +60,7 @@ module MarathonDeploy
           elapsedTime = '%.2f' % (Time.now - startTime)
           $LOG.info("Deployment with deploymentId #{@deploymentId} ended (Total deployment time #{elapsedTime}s)")  
         end
-      end    
+      end
   end
   
   def wait_for_application(message = "Deployment of application #{@application.id} in progress")
@@ -102,7 +102,7 @@ module MarathonDeploy
             $LOG.debug("Healthy instances running: " + healthy.join(','))
             break
           else
-            $LOG.info("#{healthy.size} healthy instances seen, #{@application.instances} healthy instances expected, retrying in in #{HEALTHY_WAIT_RECHECK_INTERVAL}s")
+            $LOG.info("#{healthy.size} healthy instances seen, #{@application.instances} healthy instances expected, retrying in #{HEALTHY_WAIT_RECHECK_INTERVAL}s")
           end
         end      
         sleep(HEALTHY_WAIT_RECHECK_INTERVAL)
@@ -136,11 +136,10 @@ module MarathonDeploy
   def update_app(force=false)
     url = @url + MarathonDefaults::MARATHON_APPS_REST_PATH + @application.id
     url += force ? '?force=true' : ''
-    $LOG.debug("Updating app #{@application.id}  #{url}")
+    $LOG.debug("Updating app #{@application.id} #{url}")
     response = HttpUtil.put(url,@application.json)    
     @deploymentId = Utils.response_body(response)[:deploymentId]
     return response
-    
   end
   
   def rolling_restart
@@ -163,20 +162,14 @@ module MarathonDeploy
   # returns an array of taskIds which are alive
   def get_alive(value) 
     raise ArgumentError, "value must be boolean true or false" unless (!!value == value)       
-    state = Array.new    
     if (health_checks_defined?)     
         apps = Array.new
-        
-        5.times { |i|  
-          i+=1      
-          response = list_app
-          response_body = Utils.response_body(response)
-          apps = response_body[:app]
-          break unless apps.nil?
-          $LOG.info "Application #{@application.id} is not yet registered with Marathon. Waiting #{i} seconds then retrying ..."
-          sleep i          
-        }      
-      
+        begin
+          apps = Utils.getValue(@url,@application,:app)
+        rescue Exception=>e
+          $LOG.info "EXCEPTION: #{e} Cannot determine apps"
+        end
+
         if (apps.nil? or apps.empty?)
           raise Error::DeploymentError, "Marathon API returned an empty app or nil json object for application #{@application.id}", caller
         else
@@ -208,25 +201,32 @@ module MarathonDeploy
     end
     return task_ids
   end
-  
+
   def get_task_ids
-    response = list_app
-    response_body = Utils.response_body(response)
-    return response_body[:app][:tasks].collect { |task| task[:id]}
+    begin
+      a = Utils.getValue(@url,@application,:app,:tasks).collect { |task| task[:id]}
+      return a
+    rescue Exception=>e
+      $LOG.info "EXCEPTION: #{e} Cannot determine task_ids"
+    end
   end
-  
+
   def get_healthcheck_results
-    response = list_app
-    response_body = Utils.response_body(response)
-    #puts JSON.pretty_generate(response_body)
-    return response_body[:app][:tasks].collect { |task| task[:healthCheckResults]}
+    begin
+      a = Utils.getValue(@url,@application,:app,:tasks).collect { |task| task[:healthCheckResults]}
+      return a
+    rescue Exception=>e
+      $LOG.info "EXCEPTION: #{e} Cannot determine healthcheck_result"
+    end
   end
     
   def get_deployment_id
-    response = list_app
-    payload = Utils.response_body(response)
-    return payload[:app][:deployments].first[:id] unless (payload[:app].nil?)
-    return nil
+    begin
+      a = Utils.getValue(@url,@application,:app,:deployments,0)[:id]
+      return a
+    rescue Exception=>e
+      $LOG.info "EXCEPTION: #{e} Cannot determine deployment_id"
+    end
   end
     
   def list_all
@@ -299,4 +299,4 @@ module MarathonDeploy
   end
   
   end
-end
+end

data/lib/marathon_deploy/http_util.rb

@@ -5,15 +5,22 @@ require 'marathon_deploy/error'
 module MarathonDeploy
   module HttpUtil
 
+@@o_timeout = 60.0
+@@r_timeout = 60.0
+@@og_timeout = 60.0
+@@rg_timeout = 60.0
+
   def self.put(url,payload)
     uri = construct_uri url 
     begin
       http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = @@o_timeout
+      http.read_timeout = @@r_timeout
       req = Net::HTTP::Put.new(uri.request_uri)
       req.body = payload.to_json
       req["Content-Type"] = "application/json"
       response = http.request(req)
-    rescue Errno::ECONNREFUSED => e
+    rescue Exception => e
       $LOG.error("Error calling marathon api: #{e.message}")
       exit!
     end
@@ -24,11 +31,13 @@ module MarathonDeploy
     uri = construct_uri url 
     begin
       http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = @@o_timeout
+      http.read_timeout = @@r_timeout
       req = Net::HTTP::Post.new(uri.request_uri)
       req.body = payload.to_json
       req["Content-Type"] = "application/json"
       response = http.request(req)
-    rescue Errno::ECONNREFUSED => e
+    rescue Exception => e
       message = "Error calling marathon api: #{e.message}"
       $LOG.error(message)
       raise Error::MarathonError, message, caller
@@ -45,9 +54,11 @@ module MarathonDeploy
     uri = construct_uri url 
        begin
          http = Net::HTTP.new(uri.host, uri.port)
+         http.open_timeout = @@o_timeout
+         http.read_timeout = @@r_timeout
          req = Net::HTTP::Delete.new(uri.request_uri)         
          response = http.request(req)
-       rescue Errno::ECONNREFUSED => e
+       rescue Exception => e
          message = "Error calling marathon api: #{e.message}"
          $LOG.error(message)
          raise Error::MarathonError, message, caller
@@ -62,11 +73,14 @@ module MarathonDeploy
   def self.get(url)
     uri = construct_uri url
     begin
-    http = Net::HTTP.new(uri.host, uri.port)
-    req = Net::HTTP::Get.new(uri.request_uri)
-    req["Content-Type"] = "application/json"
-    response = http.request(req)
-    rescue  Errno::ECONNREFUSED => e
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = @@og_timeout
+      http.read_timeout = @@rg_timeout
+#      http.set_debug_output($stdout)
+      req = Net::HTTP::Get.new(uri.request_uri)
+      req["Content-Type"] = "application/json"
+      response = http.request(req)
+    rescue Exception => e
       message = "Error calling marathon api: #{e.message}"
       $LOG.error(message)
       raise Error::MarathonError, message, caller
@@ -90,4 +104,4 @@ module MarathonDeploy
   end
   
   end
-end
+end

data/lib/marathon_deploy/marathon_client.rb

@@ -78,4 +78,4 @@ module MarathonDeploy
   end
   
   end
-end
+end

data/lib/marathon_deploy/utils.rb

@@ -1,3 +1,5 @@
+require 'marathon_deploy/marathon_defaults'
+
 module MarathonDeploy
   module Utils
   
@@ -23,11 +25,34 @@ module MarathonDeploy
   end
   
   def self.response_body(response)
-    if (response.is_a?(Net::HTTPResponse) && !response.body.nil?)
-      return deep_symbolize((JSON.parse(response.body)))
+    if (!response.body.nil? && !response.body.empty? && response.kind_of?(Net::HTTPSuccess))
+      begin
+        return deep_symbolize((JSON.parse(response.body)))
+      rescue Exception=>e
+        $LOG.info "EXCEPTION: #{e} Cannot parse JSON"
+      end
     end
     return nil
   end
- 
+
+  def self.getValue(url,application,*keys)
+    value = nil
+    5.times { |i|
+      i+=1
+      model = response_body(HttpUtil.get(url + MarathonDefaults::MARATHON_APPS_REST_PATH + application.id))
+      value = lookup(model, *keys) if (!model.nil? and !model.empty?)
+      break if (!value.nil? and !value.empty?)
+      $LOG.info "Application #{application.id} is not yet registered with Marathon. Waiting #{i} seconds then retrying ..."
+      sleep i
+    }
+    value
+  end
+
+  def self.lookup(model, key, *rest)
+    v = model[key]
+    return v if rest.empty?
+    v && lookup(v, *rest)
+  end
+
   end 
-end
+end

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.45"
+  VERSION = "0.1.46"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger