remote_syslog 1.6.6.1 → 1.6.7.pre1

data/README.md

@@ -174,6 +174,17 @@ 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.6.1"
+ VERSION = "1.6.7.pre1"
 end
 

data/lib/remote_syslog/agent.rb

@@ -23,11 +23,17 @@ module RemoteSyslog
     attr_accessor :facility, :severity, :hostname
 
     # Other settings
-    attr_accessor :strip_color, :parse_fields, :exclude_pattern
+    attr_accessor :strip_color, :parse_fields
 
-    # Files
+    # Exclude messages matching pattern
+    attr_accessor :exclude_pattern
+
+    # Files (can be globs)
     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
 
@@ -107,7 +113,7 @@ module RemoteSyslog
 
         files.each do |file|
           RemoteSyslog::GlobWatch.new(file, @glob_check_interval, 
-            method(:watch_file))
+            @exclude_file_pattern, method(:watch_file))
         end
       end
     end

data/lib/remote_syslog/cli.rb

@@ -217,6 +217,14 @@ 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,12 +2,19 @@ require 'eventmachine-tail'
 
 module RemoteSyslog
   class GlobWatch < EventMachine::FileGlobWatch
-    def initialize(path, interval, callback)
-      super(path, interval)
+    def initialize(path, interval, exclude_files, callback)
+      @exclude_files = exclude_files
       @callback = callback
+
+      super(path, interval)
     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.6.1'
-  s.date              = '2012-08-16'
+  s.version           = '1.6.7.pre1'
+  s.date              = '2012-09-04'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long

metadata

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