logflume 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb29b01822f89e457a933bc04be3d495bf5b66b
-  data.tar.gz: 3703168b9dd36733ec70c53a6f2d1c45f22fa5a8
+  metadata.gz: aa73715ebd82ab4cb52b2b4bcd400bedf3289206
+  data.tar.gz: caa4cc54f5fdd7a32d7e28ac737262d8c67be3d6
 SHA512:
-  metadata.gz: 8a51d4eccc0630fbb3817e3e7dc3cd1f64bebcd4b53d975f5cb94de9ca96bcb36671431c80f274b4819c78d9693139aae03c62144aaa834d588b555f1b60bae6
-  data.tar.gz: 93158fe633e007948d20725f96fc7d24fe8d4f47451edbddfadb18693fb7554bf855369367429400d9de61bcf7fbc8f3f1e03e634629d435bd37c83d5ba0f855
+  metadata.gz: f82463b4a2b06c31961ce86a535e742d7fdcaafd13efa2341f6c3a9c675bdb50e38ef1d21422dffff4d4abe63cb145cf18849ace4dea0f3b2284e6bc7925f030
+  data.tar.gz: fc43a273af1c0c75169a5540ae88920862f58289421c22321148f261b9cd348d4a1c0eb4a5255435a7bcddf3d35259eb757b0a2c86a2433ddb6b04145f08f0d0

data/lib/logflume/flume.rb

@@ -26,19 +26,19 @@ module Logflume
     end
 
     def load
-      raise InvalidDirectory unless directory_exists?(@dir)
+      raise InvalidDirectory unless _directory_exists?(@dir)
       if @shift
-          raise InvalidShiftDirectory unless directory_exists?(@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
+      _route_pipe
     end
 
     def start
       load unless configured?
-      register_signal_hooks
+      _register_signal_hooks
       @dw.start
     end
 
@@ -54,13 +54,13 @@ module Logflume
       running? ? stop : true
       @dw = nil
       @configure = false
-      destroy_pipe
+      _destroy_pipe
       true
     end
 
     private
 
-    def register_signal_hooks
+    def _register_signal_hooks
       [:INT, :QUIT, :TERM].each do |signal|
         ::Signal.trap(signal) do
           puts "Terminating..."
@@ -70,13 +70,13 @@ module Logflume
       end
     end
 
-    def route_pipe
+    def _route_pipe
       raise FlumeNotLoaded unless configured?
-      create_pipe
-      hookup_pipe
+      _create_pipe
+      _hookup_pipe
     end
 
-    def create_pipe
+    def _create_pipe
       if @blocking
         @pipe_handler = Fifo.new(@pipe, :w, :wait)
       else
@@ -84,31 +84,47 @@ module Logflume
       end
     end
 
-    def hookup_pipe
+    def _hookup_pipe
       @dw.add_observer  do |*args|
         args.each do |event|
           if event.type == :added
             @logger.info "new File found => #{event.path}"
-            if @prefix_syslog
-                File.open(event.path).each_line do |line|
-                  @pipe_handler.puts prefix + line
-                end
-            else
-                File.open(event.path).each_line do |line|
-                  @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
+            _print(event.path)
+            _shift(event.path) if @shift
           end
 
         end
       end
     end
 
-    def prefix
+    def _destroy_pipe
+      ::FileUtils.rm @pipe, :force => true
+    end
+
+    def _directory_exists?(directory)
+      File.directory?(directory)
+    end
+
+    def _print(event_file)
+        if @prefix_syslog
+            File.open(event_file).each_line do |line|
+              @pipe_handler.puts _prefix + line
+            end
+        else
+            File.open(event_file).each_line do |line|
+              @pipe_handler.puts line
+            end
+        end
+    end
+
+    def _shift(event_file)
+        if @shift
+            @logger.info "shift # " + event_file + " -> " + @shift + '/' + File.basename(event_file)
+            File.rename(event_file, @shift + '/' + File.basename(event_file))
+        end
+    end
+
+    def _prefix
         mytime = Time.now
         #template("$SOURCEIP|$FACILITY|$PRIORITY|$LEVEL|$TAG|$YEAR-$MONTH-$DAY|$HOUR:$MIN:$SEC|$PROGRAM| $MSG\n")
         #@syslog_priority = @syslog_facility * 8 + @syslog_severity
@@ -118,16 +134,8 @@ module Logflume
         return "#{@syslog_sourceip}|#{@syslog_facility}|#{@syslog_priority}|#{@syslog_level}|#{@tag}|#{ymd}|#{hms}|#{@syslog_progname}| "
     end
 
-    def directory_exists?(directory)
-      File.directory?(directory)
-    end
-
-    def destroy_pipe
-      ::FileUtils.rm @pipe, :force => true
-    end
-
     # Borrowed from SyslogLogger.
-    def clean(message)
+    def _clean(message)
       message = message.to_s.dup
       message.strip! # remove whitespace
       message.gsub!(/\n/, '\\n') # escape newlines

data/lib/logflume/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logflume
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Shadowbq