marathon-srv 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c7a44026357d3e3f3e45358ec6093963bbca8e
-  data.tar.gz: ec55ee61654b8b72bf8c7dc571e3a25734c3579a
+  metadata.gz: 392e06687d27e5473e29fd461cb3bd55884708f3
+  data.tar.gz: bdfa6997e7828349730f4699b39959a6dae2ad40
 SHA512:
-  metadata.gz: 06a26dd418e3854058515df7743d6bb2b9b5790d2290f2cad16cc190dc04130510bff5f342ad93bd82968e4c3b048a3ba1baf2f1147a3e9c17d645bc3a7aa613
-  data.tar.gz: 5150ab5cb237b4841570fa70216b34c7d303f377998bb32a050413dc3087f17ecfa6ad9ba0fc9b8d1efb1d4fbafe0282858e8c78f65a342c9bb7115e11bb8526
+  metadata.gz: 068b56f1d0372710128a6662405ee4efbefafdcc5dc12c01281459ab9df393145a9a7ac474ed67e3825de92ceeb0d0948ac61afd29c43716d63d390b35579869
+  data.tar.gz: 87fcfa7f7ba6a51df8e487270e947827624d536f631b1979ffaf87ec25608c3a2697d4e7e11fb1f466362066abb85c3b7f714279eac4b3cfce343a1396db10ef

data/lib/marathon/srv/client.rb

@@ -60,46 +60,49 @@ module Marathon
               
               @logger.debug "Retrieved app object #{app}"
               
-              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 healthy_tasks_only == false || (app["healthChecks"] != nil && app["healthChecks"].size > 0)
               
-              # collect slave ports of (healthy) tasks
               ports=[]
-              if (app["tasks"] != nil)
-                app["tasks"].each do |task|
-                  
-                  if(healthy_tasks_only)
-                    @logger.debug "Verifying health checks for task #{task}"
-                    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
-                        
+              if (app["container"]["type"] == "DOCKER")
+              
+                # collect slave ports of (healthy) tasks
+                if (app["tasks"] != nil)
+                  app["tasks"].each do |task|
+                    
+                    if(healthy_tasks_only)
+                      @logger.debug "Verifying health checks for task #{task}"
+                      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
-                      @logger.debug "No health check results - ignoring task #{task}"
+                      # just add task
+                      @logger.debug "Ignoring health checks - filtering ports for task #{task}"
+                      ports.push filter_ports(app, task, filter_ports)
+                      
                     end
-                  else
-                    # just add task
-                    @logger.debug "Ignoring health checks - filtering ports for task #{task}"
-                    ports.push filter_ports(app, task, filter_ports)
                     
                   end
-                  
                 end
-              end
-              
-              # cleanup
-              ports.reject! do |host| 
-              
-                host[:services].reject! {|protocol, services| services.size == 0 }
-                host[:services].size == 0
+                
+                # cleanup
+                ports.reject! do |host| 
+                
+                  host[:services].reject! {|protocol, services| services.size == 0 }
+                  host[:services].size == 0
+                
+                end
+                
               
               end
-              
+
               @logger.debug "Collected ports #{ports} for #{app["id"]}"
               app_ports[app["id"]] = ports
               

data/lib/marathon/srv/version.rb

@@ -1,5 +1,5 @@
 module Marathon
   module Srv
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

metadata

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