Open Build Service

rubygem-nginx-controller.changes Added

rubygem-nginx-controller.spec Changed

nginx-controller-2.0.2.gem/checksums.yaml.gz -> nginx-controller-2.0.3.gem/checksums.yaml.gz Changed

nginx-controller-2.0.2.gem/data/lib/nginx_controller.rb -> nginx-controller-2.0.3.gem/data/lib/nginx_controller.rb Changed

@@ -35,7 +35,7 @@
         Docker::Listener.run do | _ |
           update_services_status
         end
-                
+
         # when a service changes from starting to running, no event is raised
         # add all new services to a watchlist and poll docker until they are running or until a 120s timeout is reached
         EventMachine::PeriodicTimer.new(5) do
@@ -43,11 +43,11 @@
             update_services_status
           end
         end
-          
+
         EventMachine::PeriodicTimer.new(5) do
           process_letsencrypt_queue
         end
-        
+
         every_day_at_midnight do
           check_letsencrypt_status
         end
@@ -76,7 +76,7 @@
       services_ps do | services |
         puts '-> Check expiring certificates'
         services.each do | svc |
-          le_queue_add(svc) if svc.letsencrypt_expiring? 
+          le_queue_add(svc) if svc.letsencrypt_expiring?
           STDOUT.flush
         end
         STDOUT.flush
@@ -106,6 +106,19 @@
       cleanup = 
       errors = 
 
+      removed.each do | svc |
+        puts "Deleted service #{svc.name}"
+        begin
+          svc.deconfigure!
+        rescue
+          puts "Cannot deactivate service #{svc.name}: #{$!}"
+          puts "\t" + $!.backtrace0..10.join("\n\t")
+          errors << $!
+        ensure
+          watchlist_remove(svc)
+        end
+      end
+
       added.each do | svc |
         puts "New service #{svc.name}"
         begin
@@ -125,31 +138,18 @@
         begin
           pair1.reconfigure!
           if pair1.settled?
-            watchlist_remove(pair1) 
+            watchlist_remove(pair1)
           else
             watchlist_add(pair1)
           end
         rescue
-          watchlist_remove(pair1) 
+          watchlist_remove(pair1)
           puts "Cannot activate service #{pair1.name}: #{$!}"
           puts "\t" + $!.backtrace0..10.join("\n\t")
           errors << $!
         end
       end
 
-      removed.each do | svc |
-        puts "Deleted service #{svc.name}"
-        begin
-          svc.deconfigure!
-        rescue
-          puts "Cannot deactivate service #{svc.name}: #{$!}"
-          puts "\t" + $!.backtrace0..10.join("\n\t")
-          errors << $!
-        ensure
-          watchlist_remove(svc)
-        end
-      end
-
       cleanup = cleanup_config_files(services)
 
       if added.any? || changed.any? || removed.any? || cleanup.any?
@@ -188,7 +188,7 @@
 
           services.unshift MasterService.new
           services.sort!
-          
+
           block.call services
         end
       end
@@ -229,7 +229,7 @@
       configs = active_services.map(&:config_filename)
       leftovers = Dir'/etc/nginx/vhosts.d/*.conf'.inject() do | memo, cfg |
         unless cfg.in?(configs)
-          memo << cfg 
+          memo << cfg
           puts "Cleanup old config file #{cfg}"
           FileUtils.rm_f(cfg)
         end
@@ -260,7 +260,7 @@
     def le_queue_add(svc)
       unless @le_queuesvc.id
         puts "Service #{svc.name} should update letsencrypt"
-        @le_queuesvc.id = svc 
+        @le_queuesvc.id = svc
       end
     end
 
@@ -272,7 +272,7 @@
       @reloadsvc.id = svc
       watchlist_add(svc)
     end
-    
+
     def print_diff(diff)
       str = diff.map do | k, d |
         if k == :labels
@@ -293,6 +293,6 @@
         every_day_at_midnight(&block)
       end
     end
-    
+
   end
 end

nginx-controller-2.0.2.gem/metadata.gz -> nginx-controller-2.0.3.gem/metadata.gz Changed

Changes of Revision 10