semlogger 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/semlogger.rb

@@ -2,7 +2,10 @@ require 'json'
 
 class Object
 	def to_semlogger
-		[self.class.name.to_sym, self.respond_to?( :serializable_hash) ? self.serializable_hash : self ]
+		[
+			self.class.name.to_sym,
+			self.respond_to?( :serializable_hash) ? self.serializable_hash : self
+		]
 	end
 end
 
@@ -28,14 +31,25 @@ end
 
 class Semlogger < ::Logger
 	class Base
+		class <<self
+			attr_accessor :logger
+		end
 		attr_accessor :logger
 
-		def add severity, progname = nil, &block
-			@logger.add severity, self, progname = nil, &block
+		def initialize
+			@logger = self.class.logger
+		end
+
+		def add severity, logger = nil, &block
+			(logger || @logger).add severity, self, &block
 		end
 
 		::Semlogger::Severity.constants.each do |severity|
-			module_eval "def #{severity.downcase}( *a, &e) add #{::Semlogger::Severity.const_get severity}, *a, &e end", __FILE__, __LINE__
+			module_eval <<-EOC, __FILE__, __LINE__+1
+				def #{severity.downcase} *a, &e
+					add #{::Semlogger::Severity.const_get severity}, *a, &e
+				end
+			EOC
 		end
 	end
 
@@ -51,16 +65,29 @@ class Semlogger < ::Logger
 
 	attr_accessor :logdev, :level, :progname
 	class <<self
-		attr_accessor :progname
-
-		def custom( *a)  CustomType.new *a  end
-	end
+		attr_accessor :progname, :logger
+
+		def new_rails_logger config
+			require 'semlogger/rack'
+			logdev = ::Rails.root.join( 'log', "#{::Rails.env.to_s.gsub('%', '%%')}.%Y-%m-%d.%$.log").to_s
+			logger = nil
+			if Rails.env.production?
+				logger = new logdev
+				logger.level = Semlogger::INFO
+			elsif Rails.env.development?
+				logger = new Semlogger::Multiplex.new( Semlogger::FInfo.new( Semlogger::Printer.new), Semlogger::Writer.new( logdev))
+				logger.level = Semlogger::DEBUG
+			else
+				logger = new logdev
+				logger.level = Semlogger::DEBUG
+			end
+			config.middleware.swap Rails::Rack::Logger, Semlogger::Rack, [], {reqid: :uuid}
+			config.logger = logger
+		end
 
-	def custom *a
-		r = CustomType.new *a
-		r.logger = self
-		r
+		def custom( *a)  CustomType.new( *a).tap {|t| t.logger = self.logger }  end
 	end
+	def custom( *a)  CustomType.new( *a).tap {|t| t.logger = self }  end
 
 	@@progname = nil
 
@@ -70,6 +97,7 @@ class Semlogger < ::Logger
 		end
 		@progname = a[0] || @@progname
 		@level, @data, @tags, @logdev = DEBUG, {}, [], logdev
+		self.class.logger = self  if !self.class.logger && self.class.logger.is_a?( Semlogger::Default)
 	end
 
 	def tagged *tags, &e
@@ -142,6 +170,11 @@ end
 
 require 'semlogger/rotate'
 require 'semlogger/multiplex'
-require 'semlogger/rack'
 require 'semlogger/filter'
 require 'semlogger/writer'
+
+class Semlogger
+	class Default < Semlogger
+	end
+	self.logger ||= Default.new
+end

data/lib/semlogger/writer.rb

@@ -3,7 +3,11 @@ end
 
 class Semlogger::Writer < Semlogger::Output
 	def initialize logdev = nil
-		@logdev = logdev || ::Semlogger::Rotate.new( ::Rails.root.join( 'log', ::Rails.env).to_s.gsub('%', '%%') + '.%Y-%m-%d.%$.log')
+		@logdev = case logdev
+			when String then ::Semlogger::Rotate.new logdev
+			when nil then ::Semlogger::Rotate.new "log/#{File.basename $0}.%Y-%m-%d.%$.log"
+			else logdev
+			end
 	end
 
 	def add severity, time, progname, data, tags, message

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Denis Knauf
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-17 00:00:00 +02:00
+date: 2012-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency