lib/slogger/common_logger.rb in slogger-0.0.8 vs lib/slogger/common_logger.rb in slogger-0.0.9

@@ -19,11 +19,11 @@
       :emerg   => Syslog::LOG_EMERG,
       :alert   => Syslog::LOG_ALERT,
       :err     => Syslog::LOG_ERR,
       :info    => Syslog::LOG_INFO,
       :debug   => Syslog::LOG_DEBUG,
-      :warn    => Syslog::LOG_WARNING,
+      :warning => Syslog::LOG_WARNING,
     }
 
     #
     # Bridge between standard Ruby Logger and Syslog
     #
@@ -53,21 +53,33 @@
     #                 :local6, or :local7
     #
     # Raises an ArgumentError if app_name, severity, or facility is nil.
     #
     def initialize(app_name, severity, facility)
-      super app_name, severity, facility, SEVERITIES
+      super app_name, BRIDGE_SEVERITIES[severity], facility, SEVERITIES
     end
 
     def log(severity, message = nil, &block)
       if block_given? and message != nil
         super(severity, message, &block)
       else
         super(severity, (message || (block_given? && block.call) || @app_name), &nil)
       end
     end
 
+    def level
+      ::Logger.const_get(BRIDGE_SEVERITIES.to_a.rassoc(@severity)[0].to_s.upcase)
+    end
+
+    def severity
+      BRIDGE_SEVERITIES.to_a.rassoc(@severity)[0]
+    end
+
+    def severity=(value)
+      super(BRIDGE_SEVERITIES[value])
+    end
+
     def add(severity, message = nil, progname = nil, &block)
       (BRIDGE_SEVERITIES.keys - [:unknow]).each do |key|
         if ::Logger.const_get(key.to_s.upcase) == severity
           return log(BRIDGE_SEVERITIES[key], message, &block)
         end
@@ -75,15 +87,16 @@
 
       log(BRIDGE_SEVERITIES[:unkown], message, &block)
     end
 
     BRIDGE_SEVERITIES.each_key do |severity|
-      define_method severity do |message = nil, &block|
+      define_method severity do |*args, &block|
+        message = args.at(0)
         log BRIDGE_SEVERITIES[severity], message, &block
       end
 
       define_method "#{severity}?" do
-        SEVERITIES[BRIDGE_SEVERITIES[severity]] <= SEVERITIES[BRIDGE_SEVERITIES[@severity]]
+        SEVERITIES[BRIDGE_SEVERITIES[severity]] <= SEVERITIES[@severity]
       end
     end
   end
 end