remote_syslog 1.6.8 → 1.6.9

data/README.md

@@ -48,6 +48,7 @@ specified as command-line arguments (below).
         -s, --severity SEVERITY          Severity (notice)
             --strip-color                Strip color codes
             --tls                        Connect via TCP with TLS
+            --tcp                        Connect via TCP (no TLS)
             --new-file-check-interval INTERVAL
                                          Time between checks for new files
 
@@ -78,9 +79,9 @@ well as the file `/var/log/mysqld.log`. Send to port `logs.papertrailapp.com:123
 
 Stay attached to the terminal, look for and use `/etc/log_files.yml` if it
 exists, write PID to `/tmp/remote_syslog.pid`, and send with facility local0
-to `a.server.com:514`:
+to `a.example.com:514`:
 
-    $ remote_syslog -D -d a.server.com -f local0 -P /tmp /var/log/mysqld.log
+    $ remote_syslog -D -d a.example.com -f local0 --pid-file /tmp/remote_syslog.pid /var/log/mysqld.log
 
 ### Windows
 
@@ -190,10 +191,10 @@ matched.
 Run multiple instances to support more than one message-specific file format
 or to specify unique syslog hostnames.
 
-To do that, provide an alternate PID filename as a command-line option
-to the additional instance(s). For example:
+To do that, provide an alternate PID path as a command-line option to the 
+additional instance(s). For example:
 
-    --pid-file remote_syslog_2.pid
+    --pid-file /var/run/remote_syslog_2.pid
 
 
 ### Parse fields from log messages

data/examples/remote_syslog.init.d

@@ -13,7 +13,7 @@ prog="remote_syslog"
 config="/etc/log_files.yml"
 pid_dir="/var/run"
 
-EXTRAOPTIONS=""
+EXTRAOPTIONS="--tls"
 
 pid_file="$pid_dir/$prog.pid"
 
@@ -29,7 +29,7 @@ start(){
     echo -n $"Starting $prog: "
 
     unset HOME MAIL USER USERNAME
-    $prog -c $config -P $pid_dir "$EXTRAOPTIONS"
+    $prog -c $config --pid-file $pid_file "$EXTRAOPTIONS"
     RETVAL=$?
     echo
     return $RETVAL

data/lib/remote_syslog.rb

@@ -1,4 +1,4 @@
 module RemoteSyslog
- VERSION = "1.6.8"
+ VERSION = "1.6.9"
 end
 

data/lib/remote_syslog/agent.rb

@@ -7,12 +7,16 @@ require 'remote_syslog/glob_watch'
 require 'remote_syslog/message_generator'
 require 'remote_syslog/udp_endpoint'
 require 'remote_syslog/tls_endpoint'
+require 'remote_syslog/tcp_endpoint'
 
 module RemoteSyslog
   class Agent < Servolux::Server
     # Who should we connect to?
     attr_accessor :destination_host, :destination_port
 
+    # Should use TCP?
+    attr_accessor :tcp
+
     # Should use TLS?
     attr_accessor :tls
 
@@ -99,6 +103,11 @@ module RemoteSyslog
             :client_private_key => @client_private_key,
             :server_cert => @server_cert,
             :logger => logger)
+        elsif @tcp
+          max_message_size = 20480
+
+          connection = TcpEndpoint.new(@destination_host, @destination_port,
+            :logger => logger)
         else
           max_message_size = 1024
           connection = UdpEndpoint.new(@destination_host, @destination_port,
@@ -118,6 +127,16 @@ module RemoteSyslog
       end
     end
 
+    def endpoint_mode
+      @endpoint_mode ||= if @tls
+        'TCP/TLS'
+      elsif @tcp
+        'TCP'
+      else
+        'UDP'
+      end
+    end
+
     def before_stopping
       EM.stop
     end

data/lib/remote_syslog/cli.rb

@@ -101,6 +101,9 @@ module RemoteSyslog
         opts.on("--strip-color", "Strip color codes") do
           @agent.strip_color = true
         end
+        opts.on("--tcp", "Connect via TCP (no TLS)") do
+          @agent.tcp = true
+        end
         opts.on("--tls", "Connect via TCP with TLS") do
           @agent.tls = true
         end
@@ -246,7 +249,7 @@ module RemoteSyslog
       end
 
       if @no_detach
-        puts "Watching #{@agent.files.length} files/globs. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.tls ? 'TCP/TLS' : 'UDP'})."
+        puts "Watching #{@agent.files.length} files/globs. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.endpoint_mode})."
         @agent.run
       else
         daemon = Servolux::Daemon.new(:server => @agent, :after_fork => method(:redirect_io))
@@ -255,7 +258,7 @@ module RemoteSyslog
           error "Already running at #{@agent.pid_file}. To run another instance, specify a different `--pid-file`.", true
         end
 
-        puts "Watching #{@agent.files.length} files/globs. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.tls ? 'TCP/TLS' : 'UDP'})."
+        puts "Watching #{@agent.files.length} files/globs. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.endpoint_mode})."
         daemon.startup
       end
     rescue Servolux::Daemon::StartupError => e

data/lib/remote_syslog/tcp_endpoint.rb

@@ -0,0 +1,87 @@
+require 'eventmachine'
+
+module RemoteSyslog
+  # Additional class that uses TCP but no TLS.  Has the benefit of a greater max packet size
+  class TcpEndpoint
+    class Handler < EventMachine::Connection
+      def initialize(endpoint)
+        @endpoint = endpoint
+        super()
+      end
+
+      def connection_completed
+        @endpoint.connection = self
+      end
+
+      def unbind
+        @endpoint.unbind
+      end
+    end
+
+    attr_accessor :connection
+
+    attr_reader :logger
+
+    def initialize(address, port, options = {})
+      @address            = address
+      @port               = port.to_i
+      @queue_limit        = options[:queue_limit] || 10_000
+      @logger             = options[:logger] || Logger.new(STDERR)
+
+      # Try to resolve the address
+      resolve_address
+
+      # Every 60 seconds we'll see if the address has changed
+      EventMachine.add_periodic_timer(60) do
+        resolve_address
+      end
+
+      connect
+    end
+
+    def connection=(conn)
+      port, ip = Socket.unpack_sockaddr_in(conn.get_peername)
+      logger.debug "Connected to #{ip}:#{port}"
+      @connection = conn
+    end
+
+    def resolve_address
+      request = EventMachine::DnsResolver.resolve(@address)
+      request.callback do |addrs|
+        @cached_ip = addrs.first
+      end
+    end
+
+    def address
+      @cached_ip || @address
+    end
+
+    def connect
+      logger.debug "Connecting to #{address}:#{@port}"
+      EventMachine.connect(address, @port, TcpEndpoint::Handler, self)
+    end
+
+    def unbind
+      @connection = nil
+
+      EventMachine.add_timer(1) do
+        connect
+      end
+    end
+
+    def write(value)
+      if @connection
+        if @queue
+          @connection.send_data(@queue.join("\n") + "\n")
+          @queue = nil
+        end
+        @connection.send_data(value + "\n")
+      else
+        (@queue ||= []) << value
+
+        # Make sure our queue does not get to be too big
+        @queue.shift if @queue.length > @queue_limit
+      end
+    end
+  end
+end

data/remote_syslog.gemspec

@@ -8,8 +8,8 @@ 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.8'
-  s.date              = '2012-10-23'
+  s.version           = '1.6.9'
+  s.date              = '2012-11-08'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long
@@ -74,6 +74,7 @@ Gem::Specification.new do |s|
     lib/remote_syslog/file_tail_reader.rb
     lib/remote_syslog/glob_watch.rb
     lib/remote_syslog/message_generator.rb
+    lib/remote_syslog/tcp_endpoint.rb
     lib/remote_syslog/tls_endpoint.rb
     lib/remote_syslog/udp_endpoint.rb
     remote_syslog.gemspec

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 8
-  version: 1.6.8
+  - 9
+  version: 1.6.9
 platform: ruby
 authors: 
 - Troy Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-23 00:00:00 -07:00
+date: 2012-11-08 00:00:00 -08:00
 default_executable: remote_syslog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,6 +132,7 @@ files:
 - lib/remote_syslog/file_tail_reader.rb
 - lib/remote_syslog/glob_watch.rb
 - lib/remote_syslog/message_generator.rb
+- lib/remote_syslog/tcp_endpoint.rb
 - lib/remote_syslog/tls_endpoint.rb
 - lib/remote_syslog/udp_endpoint.rb
 - remote_syslog.gemspec