Darryl L. Pierce
2008-Aug-28 19:48 UTC
[Ovirt-devel] [PATCH] Added the current date/time stamp to the host-browser log.
The format of the log is "MMM DD HH:MM:SS [ip address] " for all log entries. Signed-off-by: Darryl L. Pierce <dpierce at redhat.com> --- wui/src/host-browser/host-browser.rb | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/wui/src/host-browser/host-browser.rb b/wui/src/host-browser/host-browser.rb index 881b2ae..5286b1b 100755 --- a/wui/src/host-browser/host-browser.rb +++ b/wui/src/host-browser/host-browser.rb @@ -45,14 +45,17 @@ class HostBrowser def initialize(session) @session = session - @log_prefix = "[#{session.peeraddr[3]}] " @keytab_dir = '/usr/share/ipa/html/' end + + def prefix(session) + "#{Time.now.strftime('%b %d %H:%M:%S')} #{session.peeraddr[3]} " + end # Ensures the conversation starts properly. # def begin_conversation - puts "#{@log_prefix} Begin conversation" unless defined?(TESTING) + puts "#{prefix(@session)} Begin conversation" unless defined?(TESTING) @session.write("HELLO?\n") response = @session.readline.chomp @@ -62,10 +65,10 @@ class HostBrowser # Retrieves the mode request from the remote system. # def get_mode - puts "#{@log_prefix} Determining the runtime mode." unless defined?(TESTING) + puts "#{prefix(@session)} Determining the runtime mode." unless defined?(TESTING) @session.write("MODE?\n") response = @session.readline.chomp - puts "#{@log_prefix} MODE=#{response}" unless defined?(TESTING) + puts "#{prefix(@session)} MODE=#{response}" unless defined?(TESTING) response end @@ -73,7 +76,7 @@ class HostBrowser # Requests node information from the remote system. # def get_remote_info - puts "#{@log_prefix} Begin remote info collection" unless defined?(TESTING) + puts "#{prefix(@session)} Begin remote info collection" unless defined?(TESTING) result = Hash.new result['HOSTNAME'] = @session.peeraddr[2] result['IPADDR'] = @session.peeraddr[3] @@ -114,7 +117,7 @@ class HostBrowser key, value = info.split("=") - puts "#{@log_prefix} ::Received - #{key}:#{value}" unless defined?(TESTING) + puts "#{prefix(@session)} ::Received - #{key}:#{value}" unless defined?(TESTING) result[key] = value @session.write("ACK #{key}\n") @@ -142,7 +145,7 @@ class HostBrowser key, value = info.split("=") - puts "#{@log_prefix} ::Received - #{key}:#{value}" unless defined?(TESTING) + puts "#{prefix(@session)} ::Received - #{key}:#{value}" unless defined?(TESTING) result[key] = value @session.write("ACK #{key}\n") @@ -171,7 +174,7 @@ class HostBrowser key, value = info.split("=") - puts "#{@log_prefix} ::Received - #{key}:#{value}" unless defined?(TESTING) + puts "#{prefix(@session)} ::Received - #{key}:#{value}" unless defined?(TESTING) result[key] = value @session.write("ACK #{key}\n") @@ -331,7 +334,7 @@ class HostBrowser # Ends the conversation, notifying the user of the key version number. # def end_conversation - puts "#{@log_prefix} Ending conversation" unless defined?(TESTING) + puts "#{prefix(@session)} Ending conversation" unless defined?(TESTING) @session.write("BYE\n"); end -- 1.5.5.1
Ian Main
2008-Sep-03 18:43 UTC
[Ovirt-devel] [PATCH] Added the current date/time stamp to the host-browser log.
On Thu, 28 Aug 2008 15:48:19 -0400 "Darryl L. Pierce" <dpierce at redhat.com> wrote:> The format of the log is "MMM DD HH:MM:SS [ip address] " for all > log entries.Looks good. ACK. Ian