remote_syslog 1.6.7.pre1 → 1.6.7

data/README.md

@@ -43,7 +43,7 @@ specified as command-line arguments (below).
         -f, --facility FACILITY          Facility (user)
             --hostname HOST              Local hostname to send from
         -P, --pid-dir DIRECTORY          DEPRECATED: Directory to write .pid file in
-            --pid-file FILENAME          Location of the PID file (default /Users/eric/remote_syslog.pid)
+            --pid-file FILENAME          Location of the PID file (default /var/run/remote_syslog.pid)
             --parse-syslog               Parse file as syslog-formatted file
         -s, --severity SEVERITY          Severity (notice)
             --strip-color                Strip color codes
@@ -174,17 +174,6 @@ than the current set of matches). This is not necessary for globs defined in
 the config file.
 
 
-### Excluding files from being sent
-
-Provide one or more regular expressions to prevent certain files from being
-matched.
-
-    exclude_files:
-	  - \.\d$
-	  - .bz2
-	  - .gz
-
-
 ### Multiple instances
 
 Run multiple instances to support more than one message-specific file format

data/lib/remote_syslog.rb

@@ -1,4 +1,4 @@
 module RemoteSyslog
- VERSION = "1.6.7.pre1"
+ VERSION = "1.6.7"
 end
 

data/lib/remote_syslog/agent.rb

@@ -23,17 +23,11 @@ module RemoteSyslog
     attr_accessor :facility, :severity, :hostname
 
     # Other settings
-    attr_accessor :strip_color, :parse_fields
+    attr_accessor :strip_color, :parse_fields, :exclude_pattern
 
-    # Exclude messages matching pattern
-    attr_accessor :exclude_pattern
-
-    # Files (can be globs)
+    # Files
     attr_reader :files
 
-    # Exclude files matching pattern
-    attr_accessor :exclude_file_pattern
-
     # How often should we check for new files?
     attr_accessor :glob_check_interval
 
@@ -113,7 +107,7 @@ module RemoteSyslog
 
         files.each do |file|
           RemoteSyslog::GlobWatch.new(file, @glob_check_interval, 
-            @exclude_file_pattern, method(:watch_file))
+            method(:watch_file))
         end
       end
     end

data/lib/remote_syslog/cli.rb

@@ -178,6 +178,17 @@ module RemoteSyslog
         end
       end
 
+      # We're dealing with an old-style pid_file
+      if @agent.pid_file && File.basename(@agent.pid_file) == @agent.pid_file
+        default_pid_dir = File.dirname(default_pid_file)
+
+        @agent.pid_file = File.join(default_pid_dir, @agent.pid_file)
+
+        if File.extname(@agent.pid_file) == ''
+          @agent.pid_file << '.pid'
+        end
+      end
+
       @agent.pid_file ||= default_pid_file
 
       if !@no_detach && !::Servolux.fork?
@@ -217,14 +228,6 @@ module RemoteSyslog
       if config['exclude_patterns']
         @agent.exclude_pattern = Regexp.new(config['exclude_patterns'].map { |r| "(#{r})" }.join('|'))
       end
-
-      if config['exclude_files']
-        @agent.exclude_file_pattern = Regexp.new(config['exclude_files'].map { |r| "(#{r})" }.join('|'))
-      end
-
-      if config['new_file_check_interval']
-        @agent.glob_check_interval = config['new_file_check_interval']
-      end
     end
 
     def run

data/lib/remote_syslog/glob_watch.rb

@@ -2,19 +2,12 @@ require 'eventmachine-tail'
 
 module RemoteSyslog
   class GlobWatch < EventMachine::FileGlobWatch
-    def initialize(path, interval, exclude_files, callback)
-      @exclude_files = exclude_files
-      @callback = callback
-
+    def initialize(path, interval, callback)
       super(path, interval)
+      @callback = callback
     end
 
     def file_found(path)
-      # Check if we should exclude this file
-      if @exclude_files && @exclude_files =~ path
-        return
-      end
-
       @callback.call(path)
     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.7.pre1'
-  s.date              = '2012-09-04'
+  s.version           = '1.6.7'
+  s.date              = '2012-09-10'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: remote_syslog
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 6
   - 7
-  - pre1
-  version: 1.6.7.pre1
+  version: 1.6.7
 platform: ruby
 authors: 
 - Troy Davis
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 -07:00
+date: 2012-09-10 00:00:00 -07:00
 default_executable: remote_syslog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,13 +151,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: remote_syslog