Adjust format

Author: st0012

lib/debug/session.rb

@@ -203,7 +203,6 @@ def session_server_main
     def process_event evt
       # variable `@internal_info` is only used for test
       tc, output, ev, @internal_info, *ev_args = evt
-      debug_event(tc, ev, ev_args)
       output.each{|str| @ui.puts str} if ev != :suspend
 
       case ev
@@ -1717,10 +1716,6 @@ def before_fork need_lock = true
     def after_fork_parent
       @ui.after_fork_parent
     end
-
-    def debug_event(*args)
-      DEBUGGER__.debug_event(*args, direction: ">")
-    end
   end
 
   class ProcessGroup
@@ -2039,27 +2034,23 @@ def self.debug msg
     log :DEBUG, msg
   end
 
-  # to avoid computing the large number of debug strings unnecessarily
-  DEBUG_MODE = CONFIG[:log_level] == :DEBUG
-
-  def self.debug_event(tc, ev, ev_args, direction:)
-    return unless DEBUG_MODE
-    DEBUGGER__.debug("#{direction} Event (#{ev}): #{ev_args} | #{tc} ")
+  def self.debug_event(tc, ev, args)
+    args = args.map { |arg| safe_inspect(arg) }
+    debug("#{tc.inspect} sent Event { type: #{ev.inspect}, args: #{args} } to Session")
   end
 
   def self.debug_mode(tc, old_mode, new_mode)
-    return unless DEBUG_MODE
-    DEBUGGER__.debug("Mode: #{old_mode} -> #{new_mode} | #{tc}")
+    debug("#{tc.inspect} changed mode (#{old_mode} -> #{new_mode})")
   end
 
-  def self.debug_cmd(tc, cmd, direction:)
-    return unless DEBUG_MODE
-    DEBUGGER__.debug("#{direction} Cmd #{cmd} | #{tc}")
+  def self.debug_cmd(tc, cmds)
+    cmd, *args = *cmds
+    args = args.map { |arg| safe_inspect(arg) }
+    debug("#{tc.inspect} received Cmd { type: #{cmd.inspect}, args: #{args} } from Session")
   end
 
   def self.debug_suspend(tc, event)
-    return unless DEBUG_MODE
-    DEBUGGER__.debug("Suspend #{event} | #{tc}")
+    debug("#{tc.inspect} was suspended for #{event.inspect}")
   end
 
   def self.log level, msg

lib/debug/thread_client.rb

@@ -181,7 +181,7 @@ def puts str = ''
     end
 
     def << req
-      DEBUGGER__.debug_cmd(self, req, direction: ">>")
+      DEBUGGER__.debug_cmd(self, req)
       @q_cmd << req
     end
 
@@ -191,12 +191,8 @@ def generate_info
       { location: current_frame.location_str, line: current_frame.location.lineno }
     end
 
-    def debug_event(*args)
-      DEBUGGER__.debug_event(self, *args, direction: "<")
-    end
-
     def event! ev, *args
-      debug_event(ev, args)
+      DEBUGGER__.debug_event(self, ev, args)
       @q_evt << [self, @output, ev, generate_info, *args]
       @output = []
     end
@@ -704,8 +700,6 @@ def wait_next_action_
         begin
           set_mode :waiting if !waiting?
           cmds = @q_cmd.pop
-
-          DEBUGGER__.debug_cmd(self, cmds, direction: "<<")
           # pp [self, cmds: cmds]
           break unless cmds
         ensure