lib/rflow/logger.rb in rflow-1.0.0 vs lib/rflow/logger.rb in rflow-1.0.1

@@ -3,32 +3,39 @@
 class RFlow
   class Logger
     extend Forwardable
     include Log4r
 
-    LOG_PATTERN_FORMAT = '%l [%d] %x (%p) - %M'
+    LOG_PATTERN_FORMAT = '%-5l [%d] %x (%-5p) - %M'
     DATE_METHOD = 'xmlschema(6)'
     LOG_PATTERN_FORMATTER = PatternFormatter.new :pattern => LOG_PATTERN_FORMAT, :date_method => DATE_METHOD
 
     private
     attr_accessor :internal_logger
     attr_accessor :log_file_path, :log_level, :log_name
 
     public
+    attr_accessor :context_width
 
     # make sure Log4r is initialized; ignored if custom levels are already set
     Log4r.define_levels(*Log4rConfig::LogLevels)
 
     # Delegate log methods to internal logger
     def_delegators :@internal_logger,
       *Log4r::LNAMES.map(&:downcase).map(&:to_sym),
       *Log4r::LNAMES.map(&:downcase).map {|n| "#{n}?".to_sym }
 
     def initialize(config, include_stdout = false)
+      reconfigure(config, include_stdout)
+    end
+
+    def reconfigure(config, include_stdout = false)
       @log_file_path = config['rflow.log_file_path']
-      @log_level = config['rflow.log_level']
-      @log_name = (config['rflow.application_name'] || File.basename(log_file_path))
+      @log_level = config['rflow.log_level'] || "WARN"
+      @log_name = if config['rflow.application_name']; config['rflow.application_name']
+                  elsif log_file_path; File.basename(log_file_path)
+                  else ''; end
 
       establish_internal_logger
       hook_up_logfile
       hook_up_stdout if include_stdout
       register_logging_context
@@ -45,12 +52,16 @@
 
     def close
       Outputter['rflow.log_file'].close
     end
 
+    def level=(level)
+      internal_logger.level = LNAMES.index(level.to_s) || level
+    end
+
     def toggle_log_level
-      original_log_level = LNAMES[logger.level]
+      original_log_level = LNAMES[internal_logger.level]
       new_log_level = (original_log_level == 'DEBUG' ? log_level : 'DEBUG')
 
       internal_logger.warn "Changing log level from #{original_log_level} to #{new_log_level}"
       internal_logger.level = LNAMES.index new_log_level
     end
@@ -62,13 +73,15 @@
         logger.trace = true
       end
     end
 
     def hook_up_logfile
-      begin
-        internal_logger.add FileOutputter.new('rflow.log_file', :filename => log_file_path, :formatter => LOG_PATTERN_FORMATTER)
-      rescue Exception => e
-        raise ArgumentError, "Log file '#{File.expand_path log_file_path}' problem: #{e.message}\b#{e.backtrace.join("\n")}"
+      if log_file_path
+        begin
+          internal_logger.add FileOutputter.new('rflow.log_file', :filename => log_file_path, :formatter => LOG_PATTERN_FORMATTER)
+        rescue Exception => e
+          raise ArgumentError, "Log file '#{File.expand_path log_file_path}' problem: #{e.message}\n#{e.backtrace.join("\n")}"
+        end
       end
     end
 
     def hook_up_stdout
       internal_logger.add StdoutOutputter.new('rflow_stdout', :formatter => LOG_PATTERN_FORMATTER)