Improve the default logger

Shopify · Jun 30, 2023 · 8678337 · 8678337
1 parent 0efdfcf
commit 8678337
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/pitchfork/configurator.rb b/lib/pitchfork/configurator.rb
@@ -26,11 +26,15 @@ class Configurator
     }
 
     # Default settings for Pitchfork
+    default_logger = Logger.new($stderr)
+    default_logger.formatter = Logger::Formatter.new
+    default_logger.progname = "[Pitchfork]"
+
     DEFAULTS = {
       :soft_timeout => 20,
       :cleanup_timeout => 2,
       :timeout => 22,
-      :logger => Logger.new($stderr),
+      :logger => default_logger,
       :worker_processes => 1,
       :after_worker_fork => lambda { |server, worker|
         server.logger.info("worker=#{worker.nr} gen=#{worker.generation} pid=#{$$} spawned")

diff --git a/test/integration/test_reap_logging.rb b/test/integration/test_reap_logging.rb
@@ -19,13 +19,13 @@ def test_reap_worker_logging_messages
     Process.kill(:KILL, w1_pid)
 
     assert_new_worker_forked
-    assert_stderr(/ERROR -- :.*pid=#{w1_pid}.*reaped/)
+    assert_stderr(/ERROR --.*pid=#{w1_pid}.*reaped/)
 
     w2_pid = Net::HTTP.get(URI("http://#{addr}:#{port}")).to_i
     Process.kill(:QUIT, w2_pid)
 
     assert_new_worker_forked
-    assert_stderr(/INFO -- :.*pid=#{w2_pid}.*reaped/)
+    assert_stderr(/INFO --.*pid=#{w2_pid}.*reaped/)
 
     assert_clean_shutdown(pid)
   end