logflume 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e15026be5ce1cc52fd3e7c7d79920eba1fd6372
-  data.tar.gz: fcaa560819cf1e176c55a355f6d1f27f9e822783
+  metadata.gz: 4fb29b01822f89e457a933bc04be3d495bf5b66b
+  data.tar.gz: 3703168b9dd36733ec70c53a6f2d1c45f22fa5a8
 SHA512:
-  metadata.gz: 4ed63905af69305f737cc4c9ff907259d2872d9e6ba21a482d3cd74a5ac51e0ca9ea3a1aa6bd11739eec20a1f61c45a8dbf7045699c83d84d74f8652942f4e25
-  data.tar.gz: 187870708c9ef9d7acc40dbdc17ee26fe8361d685f755d187aa91b15b0e9fb218fb3a129d46fc1560dbdb4e4fe856a00d9a79a5f4fc9b191778221325309fe50
+  metadata.gz: 8a51d4eccc0630fbb3817e3e7dc3cd1f64bebcd4b53d975f5cb94de9ca96bcb36671431c80f274b4819c78d9693139aae03c62144aaa834d588b555f1b60bae6
+  data.tar.gz: 93158fe633e007948d20725f96fc7d24fe8d4f47451edbddfadb18693fb7554bf855369367429400d9de61bcf7fbc8f3f1e03e634629d435bd37c83d5ba0f855

data/lib/logflume/exceptions.rb

@@ -1,4 +1,5 @@
 module Logflume
 	class InvalidDirectory < StandardError; end
+	class InvalidShiftDirectory < StandardError; end
   class FlumeNotLoaded < StandardError; end
-end	
+end

data/lib/logflume/flume.rb

@@ -1,6 +1,6 @@
 module Logflume
   class Flume
-    attr_accessor :dir, :glob, :logger, :pipe, :pre_load, :interval, :blocking, :prefix_syslog, :syslog_sourceip, :syslog_level, :syslog_facility, :syslog_priority, :syslog_progname, :syslog_severity
+    attr_accessor :dir, :glob, :logger, :pipe, :pre_load, :interval, :blocking, :prefix_syslog, :syslog_sourceip, :syslog_level, :syslog_facility, :syslog_priority, :syslog_progname, :syslog_severity, :shift, :bookmark
 
     def initialize(opts = {})
       @dir = opts[:dir] || './flume/'
@@ -9,6 +9,8 @@ module Logflume
       @interval = opts[:interval] || 5.0
       @pre_load = opts[:pre_load] || false
       @blocking = opts[:blocking] || false
+      @bookmark = opts[:bookmark] || false
+      @shift = opts[:shift] || false
       @prefix_syslog = opts[:prefix_syslog] || false
       @syslog_sourceip = opts[:syslog_sourceip] || "127.0.0.1"
       @syslog_facility = opts[:syslog_facility] || "local7"
@@ -25,7 +27,11 @@ module Logflume
 
     def load
       raise InvalidDirectory unless directory_exists?(@dir)
+      if @shift
+          raise InvalidShiftDirectory unless directory_exists?(@shift)
+      end
       @dw = DirectoryWatcher.new(@dir, :glob => @glob, :logger => @logger, :interval => @interval, :pre_load => @pre_load)
+      @dw.persist = @bookmark if @bookmark
       @configured = true unless @dw.nil?
       route_pipe
     end
@@ -45,7 +51,7 @@ module Logflume
     end
 
     def shutdown
-      @dw.stop ? @dw.running? : false
+      running? ? stop : true
       @dw = nil
       @configure = false
       destroy_pipe
@@ -81,11 +87,7 @@ module Logflume
     def hookup_pipe
       @dw.add_observer  do |*args|
         args.each do |event|
-
           if event.type == :added
-            #root = File.dirname(__FILE__)
-            #infile = File.join(root, event.path)
-            #@logger.info "new File found => #{infile}"
             @logger.info "new File found => #{event.path}"
             if @prefix_syslog
                 File.open(event.path).each_line do |line|
@@ -96,6 +98,10 @@ module Logflume
                   @pipe_handler.puts line
                 end
             end
+            if @shift
+                @logger.info "shift # " + event.path + " -> " + @shift + '/' + File.basename(event.path)
+                File.rename(event.path, @shift + '/' + File.basename(event.path))
+            end
           end
 
         end

data/lib/logflume/version.rb

@@ -1,3 +1,3 @@
   module Logflume
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end

data/spec/logflume/logflume_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Logflume do
 
-#Standard working test of all fields
+  #Standard working test of all fields
   it 'finds files in a directory' do
     flume = Logflume::Flume.new
     flume.dir='spec/data/flume'
@@ -32,7 +32,7 @@ describe Logflume do
     flume.syslog_progname="dpkg"
     #flume.blocking = true
     expect(flume.start.class.to_s).to eq 'DirectoryWatcher'
-    sleep(10) ## We need to ba able to catch PROC errors here.. 
+    sleep(2) ## We need to ba able to catch PROC errors here..
     flume.shutdown
   end
 
@@ -43,6 +43,14 @@ describe Logflume do
     expect{flume.start}.to raise_error(Logflume::InvalidDirectory)
   end
 
+  it 'should raise an InvalidShiftDirectory Error' do
+    flume = Logflume::Flume.new
+    flume.dir='spec/data/flume'
+    flume.glob='*.log'
+    flume.shift='/var/does/not/exist'
+    expect{flume.start}.to raise_error(Logflume::InvalidShiftDirectory)
+  end
+
   it 'finds files in a directory' do
     flume = Logflume::Flume.new
     flume.dir='spec/data/flume'
@@ -51,6 +59,45 @@ describe Logflume do
     flume.start
     #FileUtils.touch('spec/data/flume/test.log')
     expect(flume.shutdown).to eq true
+  end
+
+  describe "shift group" do
+    before(:context) do
+        require 'fileutils'
+        @data = 'spec/data/flume'
+        @monitor = '/tmp/flume'
+        @shift = '/tmp/flume-shift'
+        #Cleanup
+        FileUtils.rm_rf @monitor
+        FileUtils.rm_rf @shift
+    end
+
+    before(:example) do
+        #Setup
+        FileUtils.cp_r @data, @monitor
+        FileUtils.mkdir_p @shift
+    end
+
+    it 'handles fifo pipes' do
+        flume = Logflume::Flume.new
+        flume.dir=@monitor
+        flume.glob='*.log'
+        flume.pipe="/tmp/tmp.flume.#{$$}.fifo"
+        flume.logger = Logger.new('/dev/null')
+        flume.prefix_syslog=true
+        flume.syslog_progname="dpkg"
+        flume.shift = @shift
+        #flume.blocking = true
+        expect(flume.start.class.to_s).to eq 'DirectoryWatcher'
+        sleep(2) ## We need to ba able to catch PROC errors here..
+        flume.shutdown
+    end
+
+    after(:example) do
+        #Cleanup
+        FileUtils.rm_rf @monitor
+        FileUtils.rm_rf @shift
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logflume
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Shadowbq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: directory_watcher