remote_syslog 1.6.9 → 1.6.10

data/README.md

@@ -254,6 +254,20 @@ exclude_patterns with an array or regexes:
      - exclude this
      - \d+ things
 
+### Prepending a string to log messages
+
+Use `prepend` to prepend a string to every log message before
+transmitting.  The string is prepended to the log message body, as if it
+occurred at the start of every log file line. Include a trailing space
+if desired.
+
+Examples:
+
+    prepend: important: 
+
+or:
+
+    prepend: cafebabe-1024-4096-badd-1234abcd1234 
 
 ### Choosing app name
 

data/Rakefile

@@ -48,7 +48,7 @@ task :default => :test
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -60,7 +60,7 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"

data/examples/log_files.yml.example.advanced

@@ -5,8 +5,9 @@ files:
   - /opt/misc/*.log
   - /var/log/mysqld.log
   - /var/run/mysqld/mysqld-slow.log
-hostname: www42   # override OS hostname
+hostname: www42  # override OS hostname
 parse_fields: syslog   # predefined regex name or double-quoted regex
+prepend: '0xDEADBEEF: '  # prepend this before every log message
 exclude_patterns:
   - exclude this
   - \d+ things

data/examples/remote_syslog.upstart.conf

@@ -2,6 +2,8 @@ description "Monitor files and send to remote syslog"
 start on runlevel [2345]
 stop on runlevel [!2345]
 
+respawn
+
 pre-start exec /usr/bin/test -e /etc/log_files.yml
 
 exec /var/lib/gems/1.8/bin/remote_syslog -D --tls

data/lib/remote_syslog.rb

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

data/lib/remote_syslog/agent.rb

@@ -27,7 +27,7 @@ module RemoteSyslog
     attr_accessor :facility, :severity, :hostname
 
     # Other settings
-    attr_accessor :strip_color, :parse_fields
+    attr_accessor :strip_color, :parse_fields, :prepend
 
     # Exclude messages matching pattern
     attr_accessor :exclude_pattern
@@ -118,7 +118,7 @@ module RemoteSyslog
           :facility => @facility, :severity => @severity, 
           :strip_color => @strip_color, :hostname => @hostname, 
           :parse_fields => @parse_fields, :exclude_pattern => @exclude_pattern,
-          :max_message_size => max_message_size)
+          :prepend => @prepend, :max_message_size => max_message_size)
 
         files.each do |file|
           RemoteSyslog::GlobWatch.new(file, @glob_check_interval, 

data/lib/remote_syslog/cli.rb

@@ -239,6 +239,10 @@ module RemoteSyslog
       if config['new_file_check_interval']
         @agent.glob_check_interval = config['new_file_check_interval']
       end
+
+      if config['prepend']
+        @agent.prepend = config['prepend']
+      end
     end
 
     def run

data/lib/remote_syslog/message_generator.rb

@@ -11,6 +11,7 @@ module RemoteSyslog
       @parse_fields     = options[:parse_fields]
       @strip_color      = options[:strip_color]
       @exclude_pattern  = options[:exclude_pattern]
+      @prepend          = options[:prepend]
       @max_message_size = options[:max_message_size] || 1024
 
       @packet = SyslogProtocol::Packet.new
@@ -34,6 +35,7 @@ module RemoteSyslog
       return if @exclude_pattern && message =~ @exclude_pattern
 
       message = message.gsub(COLORED_REGEXP, '') if @strip_color
+      message = @prepend + message if @prepend
 
       packet = @packet.dup
       packet.content = message

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.9'
-  s.date              = '2012-11-08'
+  s.version           = '1.6.10'
+  s.date              = '2013-01-14'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long
@@ -78,6 +78,7 @@ Gem::Specification.new do |s|
     lib/remote_syslog/tls_endpoint.rb
     lib/remote_syslog/udp_endpoint.rb
     remote_syslog.gemspec
+    test/unit/message_generator_test.rb
   ]
   # = MANIFEST =
 

data/test/unit/message_generator_test.rb

@@ -0,0 +1,14 @@
+require 'test/unit'
+require 'remote_syslog/message_generator'
+
+class MessageGeneratorTest < Test::Unit::TestCase
+  def test_prepend_prepend
+    socket = []
+    def socket.write(packet)
+      self << packet
+    end
+    generator = RemoteSyslog::MessageGenerator.new(socket, {:prepend => 'crazy_prefix '})
+    generator.transmit("tag", "message")
+    assert_match /crazy_prefix /, socket[0]
+  end
+end

metadata

@@ -1,119 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remote_syslog
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 9
-  version: 1.6.9
+version: !ruby/object:Gem::Version
+  version: 1.6.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Troy Davis
 - Eric Lindvall
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-08 00:00:00 -08:00
-default_executable: remote_syslog
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: servolux
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: file-tail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: file-tail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
     - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: eventmachine-tail
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: eventmachine-tail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: syslog_protocol
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: syslog_protocol
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-resolv-replace
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: em-resolv-replace
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-description: Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Lightweight daemon to tail one or more log files and transmit UDP syslog
+  messages to a remote syslog host (centralized log aggregation). Generates UDP packets
+  itself instead of depending on a system syslog daemon, so it doesn't affect system-wide
+  logging configuration.
+email:
 - troy@sevenscale.com
 - eric@sevenscale.com
-executables: 
+executables:
 - remote_syslog
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.md
@@ -136,35 +150,31 @@ files:
 - lib/remote_syslog/tls_endpoint.rb
 - lib/remote_syslog/udp_endpoint.rb
 - remote_syslog.gemspec
-has_rdoc: true
+- test/unit/message_generator_test.rb
 homepage: http://github.com/papertrail/remote_syslog
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: remote_syslog
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
-summary: Monitor plain text log file(s) for new entries and send to remote syslog collector
+summary: Monitor plain text log file(s) for new entries and send to remote syslog
+  collector
 test_files: []
-