fix server_process? - don't try to parse argv, check for known defined server constants

Author: ndbroadbent

lib/log_struct/concerns/configuration.rb

@@ -10,7 +10,6 @@ module Configuration
       module ClassMethods
         extend T::Sig
 
-        SERVER_COMMAND_ARGS = T.let(["server", "s"].freeze, T::Array[String])
         CONSOLE_COMMAND_ARGS = T.let(["console", "c"].freeze, T::Array[String])
         EMPTY_ARGV = T.let([].freeze, T::Array[String])
         CI_FALSE_VALUES = T.let(["false", "0", "no"].freeze, T::Array[String])
@@ -133,8 +132,21 @@ def console_process?
         sig { returns(T::Boolean) }
         def server_process?
           return true if logstruct_server_mode?
+          # Check for web servers - the module/gem is loaded at require time
+          return true if defined?(::Puma::CLI)     # puma CLI is defined when running `puma` command
+          return true if defined?(::Puma::Server)  # or Puma::Server if already loaded
+          return true if defined?(::Unicorn::HttpServer)
+          return true if defined?(::Thin::Server)
+          return true if defined?(::Falcon::Server)
+          return true if defined?(::Rails::Server)
+          return true if sidekiq_server?
+
+          false
+        end
 
-          current_argv.any? { |arg| SERVER_COMMAND_ARGS.include?(arg) }
+        sig { returns(T::Boolean) }
+        def sidekiq_server?
+          !!(defined?(::Sidekiq) && ::Sidekiq.respond_to?(:server?) && ::Sidekiq.server?)
         end
 
         sig { returns(T::Boolean) }

lib/log_struct/semantic_logger/setup.rb

@@ -101,7 +101,7 @@ def self.configure_semantic_logger(app)
 
       sig { params(app: T.untyped).returns(Symbol) }
       def self.determine_log_level(app)
-        if app.config.log_level
+        level = if app.config.log_level
           app.config.log_level
         elsif Rails.env.production?
           :info
@@ -110,6 +110,8 @@ def self.determine_log_level(app)
         else
           :debug
         end
+        # Rails config.log_level can be a String or Symbol
+        level.is_a?(String) ? level.to_sym : level
       end
 
       sig { params(app: T.untyped).void }

rails_test_app/templates/test/integration/puma_integration_test.rb

@@ -5,6 +5,77 @@
 require "timeout"
 
 class PumaIntegrationTest < ActiveSupport::TestCase
+  # Test that running `puma` directly (without `rails server`) auto-enables LogStruct
+  # via Puma::Server detection - no LOGSTRUCT_ENABLED env var needed
+  def test_puma_direct_auto_enables_logstruct
+    port = 32124
+    env = {
+      "RAILS_ENV" => "production",
+      "RAILS_LOG_TO_STDOUT" => "1",
+      "SECRET_KEY_BASE" => "test_secret_key_base_for_production_mode_1234567890"
+    }
+
+    # Run puma directly, NOT rails server
+    cmd = ["bundle", "exec", "puma", "-p", port.to_s, "-e", "production"]
+
+    Open3.popen3(env, *cmd) do |_stdin, stdout, stderr, wait_thr|
+      begin
+        lines = []
+        Timeout.timeout(15) do
+          while (line = stdout.gets)
+            lines << line.strip
+            # Puma outputs "Listening on" when ready
+            break if line.include?("Listening on")
+          end
+        end
+
+        # Send TERM to trigger graceful shutdown
+        begin
+          Process.kill("TERM", wait_thr.pid)
+        rescue Errno::ESRCH
+          # Process already exited
+        end
+
+        # Collect shutdown output
+        Timeout.timeout(10) do
+          while (line = stdout.gets)
+            lines << line.strip
+          end
+        end
+      rescue Timeout::Error
+        # Fall through and ensure process is terminated
+      ensure
+        begin
+          Process.kill("TERM", wait_thr.pid)
+        rescue Errno::ESRCH
+          # already dead
+        end
+      end
+
+      output = lines.join("\n")
+      stderr_output = stderr.read
+
+      # Find JSON log lines - LogStruct should be enabled via Puma::Server detection
+      json_lines = lines.filter_map do |l|
+        JSON.parse(l) if l.strip.start_with?("{")
+      rescue JSON::ParserError
+        nil
+      end
+
+      assert_predicate json_lines,
+        :any?,
+        "Expected JSON logs from direct puma invocation (Puma::Server detection should enable LogStruct).\n" \
+        "STDOUT: #{output}\nSTDERR: #{stderr_output}"
+
+      # Verify we got puma lifecycle logs
+      puma_logs = json_lines.select { |h| h["src"] == "puma" }
+
+      assert_predicate puma_logs,
+        :any?,
+        "Expected puma lifecycle logs. JSON logs: #{json_lines.inspect}"
+    end
+  end
+
   def test_rails_server_emits_structured_puma_logs_and_on_exit
     port = 32123
     env = {