lines 0.1.24 → 0.1.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJhOWYwNjQ0Y2MwNzlmMThkY2U4ODAzMmFmZjA2NTE2NDU3Zjc0OQ==
+    YTI4MDczNmE2NTQ0NzYxNjk4MWI0ZDI1OTNjNzYxMDJmMDc2YTNhYg==
   data.tar.gz: !binary |-
-    NmYxNzcxNzY0YmUyOTFhNWUyNzZkZDBkYmMzYmFiZjJlMTY4YmM5Zg==
+    NDc0YmRiNWU2ZDczNDIzZTg4NDlmZjE3NjVkZmU0ZGQ0MzA5MjJjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGE3NWJhNTkyNzU4ZjI5OTY3ODhlZDRjYWYzOTczYTlhMjhhOTM2NjAxMWY0
-    MWZiOTc2NDIyNzc2ZGIwZGNlOTg0YTcxNjNhNjk2ZDc5N2MwOGE4MDhiMjhj
-    OWE2N2FiNDQ1YzdlNjhhNTkzNmViNWE4MmE3ZjhkMTdiNzM3NzI=
+    NzhmMjY0NGVjOWYyZWEzNzM4NjMyMzYxZDVlOTExNTVlZjkyYjBmNGZkNjky
+    OWYzZmVmOWJjNTcxNGI3NDg3NWJkYTk5MDk1ZTEyNjlkMWRjMGYzODA4MWI5
+    Y2UwM2NmOGY1Mzk4Y2UwNzBiNWNlMWFlNDAwY2QwNmM3OGM3Mzg=
   data.tar.gz: !binary |-
-    ODIzOWMzZDQ3Y2Y1MDk2NWRmYzUyNDExZjU0YzA2YTIyNTQ3ZjIzYTc2Mzgw
-    ZTYxZjBiZDZkMjJjMDE3MzIzZDZlYTIyMzA5YjA2Y2YwNmMyMDM3N2NiZjA0
-    NGUzZjQwYTgxOTlmY2I1ZTQ3OTdlM2QwYmQ1ZDY2NzNkZTgxMjk=
+    NzdiM2Y1NjJmZGMwY2YzNzNmNTkxMWYwZTNkNWU0NDVmNzJmY2Y4ODViNjNj
+    MWUwZjU2NGY0ZmY3MjY4OGU1M2ViNGMwODk3NzQ0YmRkZWFjMjk3MWUyYTk1
+    N2ZjYTJhMDIwZGQ3ZmNkZDU1OWNhMzNkYzM0OWQ0Zjk5NjY0OWY=

data/CHANGELOG.md

@@ -1,17 +1,24 @@
 
+0.1.25 / 2013-07-10 : the "hopefully all syslog issues are fixes" edition
+===================
+
+ * Change the logic of opening syslog with the app_name.
+ * Fixes syslog level extraction
+ * Fixes incorrect flag masks when opening syslog
+
 0.1.24 / 2013-07-09 
-==================
+===================
 
  * Fixes escaping issue with Syslog
 
 0.1.22 / 2013-06-27 
-==================
+===================
 
  * Fixes issue where Syslog is not recognized as an outputter
  * Fixes issue when Lines.use is given an array of outputters
 
 0.1.21 / 2013-06-27 
-==================
+===================
 
  * Return self when silencing the Rack::CommonLogger
  * Use Lines as the default ActiveRecord::Base logger

data/lib/lines.rb

@@ -152,22 +152,23 @@ module Lines
   require 'syslog'
   class SyslogOutputter
     PRI2SYSLOG = {
-      debug:    Syslog::LOG_DEBUG,
-      info:     Syslog::LOG_INFO,
-      warn:     Syslog::LOG_WARNING,
-      warning:  Syslog::LOG_WARNING,
-      err:      Syslog::LOG_ERR,
-      error:    Syslog::LOG_ERR,
-      crit:     Syslog::LOG_CRIT,
-      critical: Syslog::LOG_CRIT,
+      'debug'    => Syslog::LOG_DEBUG,
+      'info'     => Syslog::LOG_INFO,
+      'warn'     => Syslog::LOG_WARNING,
+      'warning'  => Syslog::LOG_WARNING,
+      'err'      => Syslog::LOG_ERR,
+      'error'    => Syslog::LOG_ERR,
+      'crit'     => Syslog::LOG_CRIT,
+      'critical' => Syslog::LOG_CRIT,
     }
 
-    def initialize(syslog = Syslog, app_name=nil)
+    def initialize(syslog = Syslog)
       @syslog = syslog
-      prepare_syslog(app_name)
     end
 
     def output(dumper, obj)
+      prepare_syslog obj[:app]
+
       obj = obj.dup
       obj.delete(:pid) # It's going to be part of the message
       obj.delete(:at)  # Also part of the message
@@ -176,25 +177,22 @@ module Lines
       level = extract_pri(obj)
       str = dumper.dump(obj)
 
-      syslog.log(level, "%s", str)
+      @syslog.log(level, "%s", str)
     end
 
     protected
 
-    attr_reader :syslog
-
     def prepare_syslog(app_name)
-      unless syslog.opened?
-        # Did you know ? app_name is detected by syslog if nil
-        syslog.open(app_name,
-                    Syslog::LOG_PID & Syslog::LOG_CONS & Syslog::LOG_NDELAY,
-                    Syslog::LOG_USER)
-      end
+      return if @syslog.opened?
+      app_name ||= File.basename($0)
+      @syslog.open(app_name,
+                  Syslog::LOG_PID | Syslog::LOG_CONS | Syslog::LOG_NDELAY,
+                  Syslog::LOG_USER)
     end
 
     def extract_pri(h)
       pri = h.delete(:pri).to_s.downcase
-      PRI2SYSLOG[pri] || PRI2SYSLOG[:info]
+      PRI2SYSLOG[pri] || Syslog::LOG_INFO
     end
   end
 

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/spec/bench.rb

@@ -53,3 +53,4 @@ end
 bm "real file logger" do
   Lines.logger.info "Ahoi this is a really cool option"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Jonas Pfenniger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler