syslogify 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5a06fe92a907c52f29708c3ade97894d62ae2ae
-  data.tar.gz: d419b1ece05a7146b93a12d745e952506ebbe904
+  metadata.gz: 7ff824b514a7b5f41ea8d6cae842dbb316d47d0a
+  data.tar.gz: fe71fcb5d549727cd8671d117612fe00469d13a6
 SHA512:
-  metadata.gz: c1cb0108438fae9ce6fcd5e4b712b27f415607def67070ca013bc523b84af5cf9744b85870965e92d86cc893c075a78bdf6d155fda0eb520be3ff6d7cffa913d
-  data.tar.gz: 262bf1ea50fd9a44c4ab825b4bad2bb34461d90c3f3f3f2bfd72b0f3c784f2480d3fd4d47db34710c6e476b93a8b480426674340c4568c43f539b0219b2ea5cd
+  metadata.gz: 761199098e7713764ec677c0e83f304c5b7a5a0d05eca888822c54f30459c0c8db962040cbb53b2dea72a294907da72693c52bdb4222de3d62e6759dc1e7a6fd
+  data.tar.gz: 18b68acc82d09618ea770c653c3510fe8dad89a78ba9c25a555643c4d38333eb0c57ce330ebd4ba8eb0be8666200e2590171e0f4daca6ab00c7fe3372f1864aa

data/lib/syslogify/forker.rb

@@ -16,19 +16,25 @@ module Syslogify
       @pid = nil
     end
 
+    # causes standard output and error to be redirected to syslog
+    # (through a subprocess)
     def start
-      return if @pid
+      return if @sink
       
-      rd, wr = IO.pipe
+      drain, @sink = IO.pipe
       @old_stdout = STDOUT.dup
       @old_stderr = STDERR.dup
 
+      # Test connection to syslog in the parent process
       Syslog.open(_identity, Syslog::LOG_CONS | Syslog::LOG_NDELAY)
       Syslog.log(Syslog::LOG_NOTICE, 'Diverting logs to syslog')
 
-      @pid = fork do
-        STDIN.reopen(rd)
-        wr.close
+      # spawn a subprocess which pipes from its standard input to syslog
+      pid = fork do
+        Process.daemon # otherwise we'll intercept signals
+        $PROGRAM_NAME = "#{Syslog.ident}.syslogify"
+        STDIN.reopen(drain)
+        @sink.close
 
         while line = STDIN.gets
           Syslog.log(Syslog::LOG_NOTICE, line.gsub('%', '%%'))
@@ -36,33 +42,47 @@ module Syslogify
         Syslog.log(Syslog::LOG_NOTICE, 'Shutting down')
       end
 
-      Syslog.close
+      Process.detach(pid) # the subprocess will shut down on its own once starved of input
+      Syslog.close # the parent does not need syslog access
 
-      rd.close
-      STDOUT.reopen(wr)
-      STDERR.reopen(wr)
+      # redirect stdout/err to the subprocess
+      drain.close
+      STDOUT.reopen(@sink)
+      STDERR.reopen(@sink)
       STDOUT.sync = STDERR.sync = true
-      
-      @old_stderr.puts('Check syslog for further messages')
+     
+      begin
+        @old_stderr.puts('Check syslog for further messages')
+      rescue Errno::EPIPE
+        # this can happen if something else tampered with our @old streams, 
+        # e.g. the daemons library
+      end
       self
     end
 
+    # cancels the outout redirection
     def stop
-      return unless @pid
-      STDOUT.reopen(@old_stdout)
-      STDERR.reopen(@old_stderr)
+      return unless @sink
+      # NOTE: we shouldn't kill the subprocess (which can be shared igqf the parent
+      # forked after #start), and it'll shut down on its own anyways.
+      STDOUT.reopen(@old_stdout) unless @old_stdout.closed?
+      STDERR.reopen(@old_stderr) unless @old_stderr.closed?
+      @sink.close unless @sink.closed?
       @old_stdout = @old_stderr = nil
-
-      Process.kill('TERM', @pid)
-      Process.wait(@pid)
-      @pid = nil
+      @sink = nil
       self
     end
 
+    # useful when e.g. the process name changes, and/or after forking
+    def restart
+      stop
+      start
+    end
+
     private
 
     def _identity
-      @identity ||= ENV.fetch('SYSLOG_IDENTITY', File.basename($PROGRAM_NAME))
+      ENV.fetch('SYSLOG_IDENTITY', File.basename($PROGRAM_NAME))
     end
   end
 end

data/lib/syslogify/version.rb

@@ -1,3 +1,3 @@
 module Syslogify
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler