lib/sawmill/logger.rb in sawmill-0.0.2 vs lib/sawmill/logger.rb in sawmill-0.0.3

@@ -87,11 +87,11 @@
         @attribute_level = @levels.get(opts_[:attribute_level])
       else
         @attribute_level = @levels.highest
       end
       @progname = opts_[:progname] || 'sawmill'
-      @record_progname = opts_[:record_progname] || @progname
+      @record_progname = opts_[:record_progname]
       @record_id_generator = opts_[:record_id_generator] || Logger._get_default_record_id_generator
       @processor = opts_[:processor] || Formatter.new(::STDOUT)
       @current_record_id = nil
     end
     
@@ -160,11 +160,11 @@
     # end_record is implicitly called in this case.
     
     def begin_record(id_=nil)
       end_record if @current_record_id
       @current_record_id = (id_ || @record_id_generator.call).to_s
-      @processor.begin_record(Entry::BeginRecord.new(@levels.highest, ::Time.now, @record_progname, @current_record_id))
+      @processor.begin_record(Entry::BeginRecord.new(@levels.highest, ::Time.now, @record_progname || @progname, @current_record_id))
       @current_record_id
     end
     
     
     # Returns the record ID for the currently open log record, or nil if
@@ -179,11 +179,11 @@
     # a record is currently open. Returns the record ID of the ended log
     # record if one was open, or nil if no log record was open.
     
     def end_record
       if @current_record_id
-        @processor.end_record(Entry::EndRecord.new(@levels.highest, ::Time.now, @record_progname, @current_record_id))
+        @processor.end_record(Entry::EndRecord.new(@levels.highest, ::Time.now, @record_progname || @progname, @current_record_id))
         id_ = @current_record_id
         @current_record_id = nil
         id_
       else
         nil
@@ -208,11 +208,11 @@
         if level_obj_.nil?
           raise Errors::UnknownLevelError, level_
         end
       end
       return true if level_obj_ < @level
-      @processor.attribute(Entry::Attribute.new(level_obj_, ::Time.now, progname_ || @record_progname, @current_record_id, key_, value_, operation_))
+      @processor.attribute(Entry::Attribute.new(level_obj_, ::Time.now, progname_ || @record_progname || @progname, @current_record_id, key_, value_, operation_))
       true
     end
     
     
     # Emits a set-attribute log entry in the current record.
@@ -231,14 +231,15 @@
     def append_attribute(key_, value_)
       attribute(key_, value_, :append)
     end
     
     
-    # Close the logger by closing the log entry processor to which it is
-    # emitting log entries.
+    # Close the logger by finishing the log entry processor to which it is
+    # emitting log entries. Returns the value returned by the processor's
+    # finish method.
     
     def close
-      @processor.close
+      @processor.finish
     end
     
     
     # Get the current progname setting for this logger