diff options
author | Steve Kemp <steve@steve.org.uk> | 2015-06-03 14:59:43 +0100 |
---|---|---|
committer | Steve Kemp <steve@steve.org.uk> | 2015-06-03 14:59:43 +0100 |
commit | 96ca2e6f659c8d15c6d080c58226e4ebd9162f25 (patch) | |
tree | 7cc251e2ae33301599b55b7eda5bc4f9747ec917 /lib/byteback/log.rb | |
parent | c9c52d21442b763d63cc1cda7e15e59f8727f52a (diff) |
Reformatted the code to lose literal TABs, etc.
Diffstat (limited to 'lib/byteback/log.rb')
-rw-r--r-- | lib/byteback/log.rb | 122 |
1 files changed, 75 insertions, 47 deletions
diff --git a/lib/byteback/log.rb b/lib/byteback/log.rb index cfd3feb..79f759b 100644 --- a/lib/byteback/log.rb +++ b/lib/byteback/log.rb @@ -2,17 +2,28 @@ require 'logger' require 'syslog' module Byteback - # Translates Ruby's Logger calls to similar calls to Syslog - # (implemented in Ruby 2.0 as Syslog::Logger). - # - # We need to neuter % signs which are taken as format strings. - # - class SyslogProxy - class << self - def debug(m); log_nopc(Syslog::LOG_DEBUG, m); end - def info(m); log_nopc(Syslog::LOG_INFO, m); end - def warn(m); log_nopc(Syslog::LOG_WARNING, m); end - def error(m); log_nopc(Syslog::LOG_ERR, m); end + # Translates Ruby's Logger calls to similar calls to Syslog + # (implemented in Ruby 2.0 as Syslog::Logger). + # + # We need to neuter % signs which are taken as format strings. + # + class SyslogProxy + class << self + def debug(m) + log_nopc(Syslog::LOG_DEBUG, m) + end + + def info(m) + log_nopc(Syslog::LOG_INFO, m) + end + + def warn(m) + log_nopc(Syslog::LOG_WARNING, m) + end + + def error(m) + log_nopc(Syslog::LOG_ERR, m) + end # # syslog(3) says: # @@ -22,40 +33,57 @@ module Byteback # Errors might be fatal to Byteback, but they're unlikely to make the # whole server unusable. So lets dial this down to ERR from EMERG. # - def fatal(m); log_nopc(Syslog::LOG_ERR, m); end - - def log_nopc(level, m) - Syslog.log(level, m.gsub("%","%%")) - end - end - end - - # Log proxy class that we can include in our scripts for some simple - # logging defaults. - # - module Log - @@me = File.expand_path($0).split("/").last - - @@logger = if STDIN.tty? && !ENV['BYTEBACK_TO_SYSLOG'] - logger = Logger.new(STDERR) - logger.level = Logger::DEBUG - logger.formatter = proc { |severity, datetime, progname, msg| - if severity == "FATAL" || severity == "ERROR" - "*** #{msg}\n" - else - "#{msg}\n" - end - } - logger - else - Syslog.open(@@me) - SyslogProxy - end - - def debug(*a); @@logger.__send__(:debug, *a); end - def info(*a); @@logger.__send__(:info, *a); end - def warn(*a); @@logger.__send__(:warn, *a); end - def fatal(*a); @@logger.__send__(:fatal, *a); exit 1; end - def error(*a); @@logger.__send__(:error, *a); end - end + def fatal(m) + log_nopc(Syslog::LOG_ERR, m) + end + + def log_nopc(level, m) + Syslog.log(level, m.gsub('%', '%%')) + end + end + end + + # Log proxy class that we can include in our scripts for some simple + # logging defaults. + # + module Log + @@me = File.expand_path($PROGRAM_NAME).split('/').last + + @@logger = if STDIN.tty? && !ENV['BYTEBACK_TO_SYSLOG'] + logger = Logger.new(STDERR) + logger.level = Logger::DEBUG + logger.formatter = proc { |severity, _datetime, _progname, msg| + if severity == 'FATAL' || severity == 'ERROR' + "*** #{msg}\n" + else + "#{msg}\n" + end + } + logger + else + Syslog.open(@@me) + SyslogProxy + end + + def debug(*a) + @@logger.__send__(:debug, *a) + end + + def info(*a) + @@logger.__send__(:info, *a) + end + + def warn(*a) + @@logger.__send__(:warn, *a) + end + + def fatal(*a) + @@logger.__send__(:fatal, *a) + exit 1 + end + + def error(*a) + @@logger.__send__(:error, *a) + end + end end |