Skip to content

Commit

Permalink
Rhodes-specific logging adaptation
Browse files Browse the repository at this point in the history
  • Loading branch information
jtara committed Dec 20, 2011
1 parent b307a15 commit e547655
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions lib/xmpp4r/debuglog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
# Website::http://home.gna.org/xmpp4r/

require 'logger'
require 'logger' if !defined? Rhodes::VERSION

module Jabber
def Jabber::logger
@@logger ||= Logger.new($stderr)
if defined? Rhodes::VERSION
@@logger ||= RhoLog.new
else
@@logger ||= Logger.new($stderr)
end
end

# Set the logger to use for debug and warn (if enabled)
def Jabber::logger=(logger)
@@logger = logger
Expand Down Expand Up @@ -51,13 +55,21 @@ def Jabber::debug
# first one. Time is prepended to the string.
def Jabber::debuglog(string)
return if not @@debug
logger.debug string.chomp.gsub("\n", "\n ")
if defined? Rhodes::VERSION
logger.info 'XMPP4R', string.chomp # Note Rhodes currently lacks a debug logger method
else
logger.debug string.chomp.gsub("\n", "\n ")
end
end

# Outputs a string only if warnings mode is enabled.
def Jabber::warnlog(string)
return if not @@warnings
logger.warn string.chomp.gsub("\n", "\n ")
if defined? Rhodes::VERSION
logger.info 'XMPP4R', string.chomp
else
logger.warn string.chomp.gsub("\n", "\n ")
end
end

end

0 comments on commit e547655

Please sign in to comment.