1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-05 14:57:30 +01:00

Land #8601, make session logging more useful, don't lose characters

This commit is contained in:
Brent Cook 2017-06-23 17:36:01 -05:00
commit c3090a4f9c
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
2 changed files with 3 additions and 2 deletions

View File

@ -214,8 +214,9 @@ module Session
dstr = sprintf("%.4d%.2d%.2d", dt.year, dt.mon, dt.mday)
rhost = session_host.gsub(':', '_')
sname = name.to_s.gsub(/\W+/,'_')
"#{dstr}_#{rhost}_#{type}"
"#{dstr}_#{sname}_#{rhost}_#{type}"
end
#

View File

@ -13,7 +13,7 @@ class TimestampFlatfile < Flatfile
def log(sev, src, level, msg, from) # :nodoc:
return unless msg.present?
msg = msg.chop.gsub(/\x1b\[[0-9;]*[mG]/,'').gsub(/[\x01-\x02]/, " ")
msg = msg.gsub(/\x1b\[[0-9;]*[mG]/,'').gsub(/[\x01-\x02]/, ' ').gsub(/\s+$/,'')
fd.write("[#{get_current_timestamp}] #{msg}\n")
fd.flush
end