lib/rocket_job/subscribers/server.rb in rocketjob-5.0.0 vs lib/rocket_job/subscribers/server.rb in rocketjob-5.1.0

@@ -7,12 +7,12 @@
 
       def initialize(supervisor)
         @supervisor = supervisor
       end
 
-      def kill(server_id: nil, wait_timeout: 3)
-        return unless my_server?(server_id)
+      def kill(server_id: nil, name: nil, wait_timeout: 3)
+        return unless my_server?(server_id, name)
 
         supervisor.synchronize do
           supervisor.worker_pool.stop
           supervisor.worker_pool.join(wait_timeout)
           supervisor.worker_pool.kill
@@ -20,52 +20,53 @@
 
         Supervisor.shutdown!
         logger.info "Killed"
       end
 
-      def pause(server_id: nil)
-        return unless my_server?(server_id)
+      def pause(server_id: nil, name: nil)
+        return unless my_server?(server_id, name)
 
         supervisor.synchronize { supervisor.server.pause! if supervisor.server.may_pause? }
         Supervisor.event!
         logger.info "Paused"
       end
 
-      def refresh(server_id: nil)
-        return unless my_server?(server_id)
+      def refresh(server_id: nil, name: nil)
+        return unless my_server?(server_id, name)
 
         Supervisor.event!
         logger.info "Refreshed"
       end
 
-      def resume(server_id: nil)
-        return unless my_server?(server_id)
+      def resume(server_id: nil, name: nil)
+        return unless my_server?(server_id, name)
 
         supervisor.synchronize { supervisor.server.resume! if supervisor.server.may_resume? }
         Supervisor.event!
         logger.info "Resumed"
       end
 
-      def stop(server_id: nil)
-        return unless my_server?(server_id)
+      def stop(server_id: nil, name: nil)
+        return unless my_server?(server_id, name)
 
         Supervisor.shutdown!
         logger.info "Shutdown"
       end
 
-      def thread_dump(server_id: nil)
-        return unless my_server?(server_id)
+      def thread_dump(server_id: nil, name: nil)
+        return unless my_server?(server_id, name)
 
         logger.info "Thread dump"
         supervisor.worker_pool.log_backtraces
       end
 
       private
 
-      def my_server?(server_id)
-        return true if server_id.nil?
+      def my_server?(server_id, name)
+        return true if server_id.nil? && name.nil?
+        return true if supervisor.server.name == name
 
-        server_id == supervisor.server.id
+        server_id.to_s == supervisor.server.id.to_s
       end
     end
   end
 end