remote_syslog 1.3.0 → 1.3.1

data/README.md

@@ -49,8 +49,8 @@ specified as arguments to the remote_syslog daemon. More below.
             --pid-file FILENAME          PID filename (<program name>.pid)
             --parse-syslog               Parse file as syslog-formatted file
         -s, --severity SEVERITY          Severity (notice)
-            --tls                        Connect via TCP with TLS
             --strip-color                Strip color codes
+            --tls                        Connect via TCP with TLS
         -h, --help                       Show this message
     
 
@@ -139,6 +139,16 @@ message with:
 Per-file parsing is not supported. Run multiple instances.
 
 
+### Optional: Run multiple instances
+
+Run multiple instances to support more than one message-specific file format 
+(concurrently) or to specify distinct syslog hostnames. To do so, provide
+an alternative PID filename as a command-line option to additional 
+instance(s), such as:
+
+    --pid-file remote_syslog_2.pid
+    
+
 ## Reporting bugs
 
 1. See whether the issue has already been reported: <https://github.com/papertrail/remote_syslog/issues/>

data/lib/remote_syslog.rb

@@ -1,5 +1,5 @@
 module RemoteSyslog
- VERSION = "1.3.0"
+ VERSION = "1.3.1"
 end
 
 require 'remote_syslog/reader'

data/lib/remote_syslog/cli.rb

@@ -7,8 +7,8 @@ require 'daemons'
 module RemoteSyslog
   class Cli
     FIELD_REGEXES = {
-      'syslog' => /^(\w+ \d+ \S+) (\w+) ([^: ]+):? (.*)$/,
-      'rfc3339' => /^(\S+) (\w+) ([^: ]+):? (.*)$/
+      'syslog' => /^(\w+ +\d+ \S+) (\S+) ([^: ]+):? (.*)$/,
+      'rfc3339' => /^(\S+) (\S+) ([^: ]+):? (.*)$/
     }
 
     def self.process!(argv)
@@ -82,12 +82,12 @@ module RemoteSyslog
         opts.on("-s", "--severity SEVERITY", "Severity (notice)") do |v|
           @severity = v
         end
-        opts.on("--tls", "Connect via TCP with TLS") do
-          @tls = true
-        end
         opts.on("--strip-color", "Strip color codes") do
           @strip_color = true
         end
+        opts.on("--tls", "Connect via TCP with TLS") do
+          @tls = true
+        end
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/remote_syslog/reader.rb

@@ -28,12 +28,14 @@ module RemoteSyslog
       @packet.hostname = local_hostname
       @packet.facility = options[:facility] || 'user'
       @packet.severity = options[:severity] || 'notice'
-      @packet.tag      = options[:program]  || File.basename(path) || File.basename($0)
+
+      tag = options[:program]  || File.basename(path) || File.basename($0)
 
       # Make sure the tag isn't too long
-      if @packet.tag.length > 32
-        @packet.tag = @packet.tag[0..31]
+      if tag.length > 32
+        tag = tag[0..31]
       end
+      @packet.tag = tag
     end
 
     def receive_data(data)

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.3.0'
-  s.date              = '2011-07-29'
+  s.version           = '1.3.1'
+  s.date              = '2011-08-04'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Troy Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 -07:00
+date: 2011-08-04 00:00:00 -07:00
 default_executable: remote_syslog
 dependencies: 
 - !ruby/object:Gem::Dependency