remote_syslog 1.6.6.rc1 → 1.6.6.rc2

data/lib/remote_syslog.rb

@@ -1,4 +1,4 @@
 module RemoteSyslog
- VERSION = "1.6.6.rc1"
+ VERSION = "1.6.6.rc2"
 end
 

data/lib/remote_syslog/agent.rb

@@ -47,6 +47,22 @@ module RemoteSyslog
       super('remote_syslog', :logger => logger, :pid_file => options[:pid_file])
     end
 
+    def log_file=(file)
+      @log_file = File.expand_path(file)
+
+      level = self.logger.level
+      self.logger = Logger.new(file)
+      self.logger.level = level
+    end
+
+    def redirect_io!
+      if @log_file
+        STDOUT.reopen(@log_file, 'a')
+        STDERR.reopen(@log_file, 'a')
+        STDERR.sync = STDOUT.sync = true
+      end
+    end
+
     def files=(files)
       @files = [ @files, files ].flatten.compact.uniq
     end

data/lib/remote_syslog/cli.rb

@@ -118,9 +118,7 @@ module RemoteSyslog
           @agent.eventmachine_tail = v
         end
         opts.on("--debug-log FILE", "Log internal debug messages") do |v|
-          level = @agent.logger.level
-          @agent.logger = Logger.new(v)
-          @agent.logger.level = level
+          @agent.log_file = v
         end
 
         severities = Logger::Severity.constants + Logger::Severity.constants.map { |s| s.downcase }
@@ -222,11 +220,17 @@ module RemoteSyslog
     end
 
     def run
+      Thread.abort_on_exception = true
+
+      if @agent.tls && !eventmachine_supports_tls?
+        error "TLS is not supported by eventmachine installed on this system.\nThe openssl-devel/openssl-dev package must be installed before installing eventmachine."
+      end
+
       if @no_detach
         puts "Watching #{@agent.files.length} files/paths. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.tls ? 'TCP/TLS' : 'UDP'})."
         @agent.run
       else
-        daemon = Servolux::Daemon.new(:server => @agent)
+        daemon = Servolux::Daemon.new(:server => @agent, :after_fork => method(:redirect_io))
 
         if daemon.alive?
           error "Already running at #{@agent.pid_file}. To run another instance, specify a different `--pid-file`.", true
@@ -246,6 +250,42 @@ module RemoteSyslog
       exit(0)
     end
 
+    def redirect_io
+      @agent.redirect_io!
+    end
+
+    # This is a terrible hack due to the fact that eventmachine does not
+    # provide a way to detect if it has been compiled with TLS support
+    # and throws a C++ std::runtime_error if TLS is not available that we
+    # are unable to catch from ruby
+    def eventmachine_supports_tls?
+      rio, wio, = IO.pipe
+
+      pid = fork do
+        rio.close
+        STDOUT.reopen wio
+        STDERR.reopen wio
+        STDOUT.sync = STDERR.sync = true
+        EM.run_block { EventMachine.connect('0.0.0.0', 1) { |c| c.start_tls } }
+      end
+
+      wio.close
+      result = rio.read
+      _, status = Process.wait2(pid)
+
+      @agent.logger.debug "Results from eventmachine_supports_tls: #{status}: #{result}"
+
+      if status.exitstatus == 0
+        return true
+      elsif result =~ /Encryption not available/
+        return false
+      else
+        # We'll assume we can work if the problem wasn't related to encryption
+        return true
+      end
+    end
+
+
     def error(message, try_help = false)
       puts "#{program_name}: #{message}"
       if try_help

data/lib/remote_syslog/file_tail_reader.rb

@@ -33,6 +33,8 @@ module RemoteSyslog
           @callback.call(@tag, line)
         end
       end
+    rescue => e
+      @logger.error "Unhandled FileTailReader Exception: #{e.class}: #{e.message}:\n\t#{e.backtrace.join("\n\t")}"
     end
   end
 end

data/remote_syslog.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'remote_syslog'
-  s.version           = '1.6.6.rc1'
+  s.version           = '1.6.6.rc2'
   s.date              = '2012-08-13'
   s.rubyforge_project = 'remote_syslog'
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 6
   - 6
-  - rc1
-  version: 1.6.6.rc1
+  - rc2
+  version: 1.6.6.rc2
 platform: ruby
 authors: 
 - Troy Davis