Skip to content

🔍 Improve debug connection trace output #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nevans wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −9
Open

🔍 Improve debug connection trace output #648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lib/net/imap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ def initialize(host, port: nil, ssl: nil, response_handlers: nil,

# Basic Client State
@utf8_strings = false
@debug_output_bol = true
@debug_output_line = nil
@exception = nil
@greeting = nil
@capabilities = nil
Expand Down Expand Up @@ -3586,7 +3586,7 @@ def get_tagged_response(tag, cmd, timeout = nil)
def get_response
buff = @reader.read_response_buffer
return nil if buff.length == 0
$stderr.print(buff.gsub(/^/n, "S: ")) if config.debug?
synchronize do print_debug_trace("S: ", buff) end if config.debug?
@parser.parse(buff)
end

Expand Down Expand Up @@ -3671,15 +3671,20 @@ def generate_tag

def put_string(str)
@sock.print(str)
if config.debug?
if @debug_output_bol
$stderr.print("C: ")
print_debug_trace("C: ", str) if config.debug?
end

def print_debug_trace(prefix, str)
str.each_line do |line|
if @debug_output_line.nil? then $stderr.print prefix
elsif @debug_output_line != prefix then $stderr.print "\n", prefix
end
$stderr.print(str.gsub(/\n/n) { $'.empty? ? $& : "\nC: " })
if /\n\z/n.match(str)
@debug_output_bol = true
if /\n\z/n.match?(line)
$stderr.puts line.dump.delete_prefix('"').delete_suffix('"')
@debug_output_line = nil
else
@debug_output_bol = false
$stderr.print line.dump.delete_prefix('"').delete_suffix('"')
@debug_output_line = prefix
end
end
end
Expand Down