marathon-srv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593a5842b3b6e8a4ad064d43e1ce33cd0e191942
-  data.tar.gz: 13962e41a441a18964aedff0a307fa01ef75a357
+  metadata.gz: 5da8830afef77b37faf38ed0611aba764248694f
+  data.tar.gz: 678712c4dcb2d73f0755f80d78f9b2e0f9b33bfc
 SHA512:
-  metadata.gz: a2db9b8d080f9b3d1eee126a17b89049c15fbeda0238034d78c43758c8015ee1364f0ba0fc564b72c8e9f34d85fb3276bae13bc161f02088b20cae354f36d9c5
-  data.tar.gz: d13dc1b605c105c28dfb95a20b4913a2877ab5bef70758f9965d5dd3a775734f3c02b7131954509866cd3c8af07dd35876d98785b22ffab3cf2a0e78db61d008
+  metadata.gz: 5ea6c0f58114533ef79c0ffe6db5b62dcb0f2113598a8db8a8ea75b5eab2df5c5b6381686e1efc7d85993b82b7945804ef388608196dc499c1f353c38542cbea
+  data.tar.gz: 85ceb208e763b931403b853de69ba2d459a0da37faed12776f9a191f5cb5434b0907572a51ebaa13e9637d7bef064274057009205d8d7921ebe01d188f74a88c

data/lib/marathon/srv/client.rb

@@ -62,7 +62,7 @@ module Marathon
               
               raise Marathon::Srv::NotDockerContainerizedApplicationError.new unless app["container"]["type"] == "DOCKER"
               raise Marathon::Srv::NoRunningTasksFoundError.new unless app["tasks"].size > 0
-              raise Marathon::Srv::NoHealthChecksDefinedError.new unless app["healthChecks"] != nil && app["healthChecks"].size > 0
+              raise Marathon::Srv::NoHealthChecksDefinedError.new unless healthy_tasks_only == false || (app["healthChecks"] != nil && app["healthChecks"].size > 0)
               
               # collect slave ports of (healthy) tasks
               ports=[]
@@ -71,14 +71,17 @@ module Marathon
                   
                   if(healthy_tasks_only)
                     @logger.debug "Verifying health checks for task #{task}"
-                    # all health checks must be passing
-                    passing=true
-                    task["healthCheckResults"].each do |health_check_result|
-                      (passing=false; @logger.debug "%s has failing health check, not considering it" % task; break) unless health_check_result["alive"] == true
-                      
+                    if (task["healthCheckResults"] != nil)
+                      # all health checks must be passing
+                      passing=true
+                      task["healthCheckResults"].each do |health_check_result|
+                        (passing=false; @logger.debug "%s has failing health check, not considering it" % task; break) unless health_check_result["alive"] == true
+                        
+                      end
+                      (@logger.debug "All health checks passing - filtering ports for task #{task}"; ports.push filter_ports(app, task, filter_ports)) if passing
+                    else
+                      @logger.debug "No health check results - ignoring task #{task}"
                     end
-                    (@logger.debug "All health checks passing - filtering ports for task #{task}"; ports.push filter_ports(app, task, filter_ports)) if passing
-                    
                   else
                     # just add task
                     @logger.debug "Ignoring health checks - filtering ports for task #{task}"

data/lib/marathon/srv/version.rb

@@ -1,5 +1,5 @@
 module Marathon
   module Srv
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marathon-srv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andras Szerdahelyi