Replace the last direct calls to Solid Queue's logger

With Active Support notifications.

Author: rosa

lib/solid_queue/log_subscriber.rb

@@ -105,14 +105,29 @@ def graceful_termination(event)
     if event.payload[:shutdown_timeout_exceeded]
       warn formatted_event(event, action: "Supervisor wasn't terminated gracefully - shutdown timeout exceeded", **attributes)
     else
-      formatted_event(event, action: "Supervisor terminated gracefully", **attributes)
+      info formatted_event(event, action: "Supervisor terminated gracefully", **attributes)
     end
   end
 
   def immediate_termination(event)
     info formatted_event(event, action: "Supervisor terminated immediately", **event.payload.slice(:supervisor_pid, :supervised_pids))
   end
 
+  def unhandled_signal_error(event)
+    error formatted_event(event, action: "Received unhandled signal", **event.payload.slice(:signal))
+  end
+
+  def replace_fork(event)
+    status = event.payload[:status]
+    attributes = event.payload.slice(:pid).merge(status: status.exitstatus, pid_from_status: status.pid)
+
+    if replaced_fork = event.payload[:fork]
+      info formatted_event(event, action: "Replaced #{replaced_fork.kind}", **attributes.merge(hostname: replaced_fork.hostname))
+    else
+      warn formatted_event(event, action: "Tried to replace forked process but it had already died", **attributes)
+    end
+  end
+
   private
     def formatted_event(event, action:, **attributes)
       "SolidQueue-#{SolidQueue::VERSION} #{action} (#{event.duration.round(1)}ms)  #{formatted_attributes(**attributes)}"

lib/solid_queue/processes/signals.rb

@@ -38,7 +38,7 @@ def handle_signal(signal)
         when :QUIT
           request_immediate_termination
         else
-          SolidQueue.logger.warn "Received unhandled signal #{signal}"
+          SolidQueue.instrument :unhandled_signal_error, signal: signal
         end
       end
 

lib/solid_queue/supervisor.rb

@@ -152,11 +152,11 @@ def reap_terminated_forks
       end
 
       def replace_fork(pid, status)
-        if supervised_fork = forks.delete(pid)
-          SolidQueue.logger.info "[SolidQueue] Restarting fork[#{status.pid}] (status: #{status.exitstatus})"
-          start_fork(supervised_fork)
-        else
-          SolidQueue.logger.info "[SolidQueue] Tried to replace fork[#{pid}] (status: #{status.exitstatus}, fork[#{status.pid}]), but it had already died  (status: #{status.exitstatus})"
+        SolidQueue.instrument(:replace_fork, supervisor_pid: ::Process.pid, pid: pid, status: status) do |payload|
+          if supervised_fork = forks.delete(pid)
+            payload[:fork] = supervised_fork
+            start_fork(supervised_fork)
+          end
         end
       end