app/services/katello/event_daemon.rb in katello-3.15.3.1 vs app/services/katello/event_daemon.rb in katello-3.16.0.rc1

@@ -16,28 +16,27 @@
         end
       end
 
       def check_services(error, status)
         @service_classes.each do |service_class|
-          begin
-            status = service_class.status
-          rescue => error
-            Rails.logger.error("Error occurred while pinging #{service_class}")
-            Rails.logger.error(error.message)
-            Rails.logger.error(error.backtrace.join("\n"))
-          ensure
-            if error || !status&.dig(:running)
-              begin
-                service_class.close
-                service_class.run
-              rescue => error
-                Rails.logger.error("Error occurred while starting #{service_class}")
-                Rails.logger.error(error.message)
-                Rails.logger.error(error.backtrace.join("\n"))
-              ensure
-                error = nil
-              end
+          status = service_class.status
+        rescue => error
+          Rails.logger.error("Error occurred while pinging #{service_class}")
+          Rails.logger.error(error.message)
+          Rails.logger.error(error.backtrace.join("\n"))
+        ensure
+          if error || !status&.dig(:running)
+            begin
+              service_class.close
+              service_class.run
+              service_class.status
+            rescue => error
+              Rails.logger.error("Error occurred while starting #{service_class}")
+              Rails.logger.error(error.message)
+              Rails.logger.error(error.backtrace.join("\n"))
+            ensure
+              error = nil
             end
           end
         end
       end
     end
@@ -78,9 +77,10 @@
       end
 
       def stop
         return unless pid == Process.pid
         @monitor_thread.kill
+        @cache.clear
         services.values.each(&:close)
         File.unlink(pid_file) if pid_file && File.exist?(pid_file)
       end
 
       def start