logflume 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a92a64b9bace5a1daaa45778fdcebd557571a33
-  data.tar.gz: 563c95da849f5dad5d93580f7cc1053725201735
+  metadata.gz: 1574262c08ea7ea7ed4397ac75d87a56dea416d6
+  data.tar.gz: c9b2fcfc55a57092d2377e248aea47d59a2345c1
 SHA512:
-  metadata.gz: cc6fbadefacbbfa74c69827a95cd8a82bb1fa58edbc4fb5ab61983c1be2def3921103192d2cb1a424d830768bd46052aba9b31eec32d3ca67e1e0a938e5eaac8
-  data.tar.gz: dda8f6672b8ffcd8853428f917f197e86a46de1f7c34142c420452a7e21bc9add7f23eb88623fd234209bb1e9322ebe8839170dda40517639219e01598a0bb3a
+  metadata.gz: 262bf57233ce2b814740182339e6f964372fe05fc257c3fece571aea4952c7a70bdf8a4ed957c7b64b232ca0a2e17dac5d6ed30c80b8b227e8fe27906e8884f9
+  data.tar.gz: aedf52b24820a3bc04eddf8f85e36085a203edbdee6c61e96fda9ece1ec36e03d9f7f351c201e6eec16b36e25d21940340b4500678293270149b1f9d440be620

data/lib/logflume/flume.rb

@@ -9,6 +9,12 @@ module Logflume
       @interval = opts[:interval] || 5.0
       @pre_load = opts[:pre_load] || false
       @blocking = opts[:blocking] || false
+      @prefix_syslog = opts[:prefix_syslog] || false
+      @syslog_sourceip = opts[:syslog_sourceip] || "127.0.0.1"
+      @syslog_facility = opts[:syslog_facility] || "local7"
+      @syslog_level = opts[:syslog_level] || "info"
+      @syslog_priority = opts[:syslog_priority] || "info"
+      @syslog_progname = opts[:syslog_progname] || "logflume"
       @pipe = opts[:pipe] || "/tmp/logflume.pipe.#{$$}"
       @configured = false
     end
@@ -65,29 +71,45 @@ module Logflume
     end
 
     def create_pipe
-      if @blocking 
+      if @blocking
         @pipe_handler = Fifo.new(@pipe, :w, :wait)
-      else  
+      else
         @pipe_handler = Fifo.new(@pipe)
       end
     end
 
     def hookup_pipe
-      @dw.add_observer  do |*args| 
-        args.each do |event| 
-          
+      @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}"
-            File.open(event.path).each_line do |line| 
-              @pipe_handler.puts line
+            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
           end
 
         end
-      end 
+      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
+        ymd = a.strftime("%Y-%M-%d")
+        hms = a.strftime("%H:%m:%S")
+        @tag = "logflume"
+        return "#{@syslog_sourceip}|#{@syslog_facility}|#{@syslog_priority}|#{@syslog_level}|#{@tag}|#{ymd}|#{hms}|#{@syslog_progname}| "
     end
 
     def directory_exists?(directory)
@@ -95,8 +117,18 @@ module Logflume
     end
 
     def destroy_pipe
-      ::FileUtils.rm @pipe, :force => true 
+      ::FileUtils.rm @pipe, :force => true
+    end
+
+    # Borrowed from SyslogLogger.
+    def clean(message)
+      message = message.to_s.dup
+      message.strip! # remove whitespace
+      message.gsub!(/\n/, '\\n') # escape newlines
+      message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
+      message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
+      message
     end
 
   end
-end
+end

data/lib/logflume/syslog_constants.rb

@@ -0,0 +1,35 @@
+=begin
+0	kern	kernel messages
+1	user	user-level messages
+2	mail	mail system
+3	daemon	system daemons
+4	auth	security/authorization messages
+5	syslog	messages generated internally by syslogd
+6	lpr	line printer subsystem
+7	news	network news subsystem
+8	uucp	UUCP subsystem
+9		clock daemon
+10	authpriv	security/authorization messages
+11	ftp	FTP daemon
+12	-	NTP subsystem
+13	-	log audit
+14	-	log alert
+15	cron	clock daemon
+16	local0	local use 0 (local0)
+17	local1	local use 1 (local1)
+18	local2	local use 2 (local2)
+19	local3	local use 3 (local3)
+20	local4	local use 4 (local4)
+21	local5	local use 5 (local5)
+22	local6	local use 6 (local6)
+23	local7	local use 7 (local7)
+
+"code" => 0,	"severity" => "Emergency",	"keyword"emerg (panic)	System is unusable.	A "panic" condition usually affecting multiple apps/servers/sites. At this level it would usually notify all tech staff on call.
+1	Alert	alert	Action must be taken immediately.	Should be corrected immediately, therefore notify staff who can fix the problem. An example would be the loss of a primary ISP connection.
+2	Critical	crit	Critical conditions.	Should be corrected immediately, but indicates failure in a secondary system, an example is a loss of a backup ISP connection.
+3	Error	err (error)	Error conditions.	Non-urgent failures, these should be relayed to developers or admins; each item must be resolved within a given time.
+4	Warning	warning (warn)	Warning conditions.	Warning messages, not an error, but indication that an error will occur if action is not taken, e.g. file system 85% full - each item must be resolved within a given time.
+5	Notice	notice	Normal but significant condition.	Events that are unusual but not error conditions - might be summarized in an email to developers or admins to spot potential problems - no immediate action required.
+6	Informational	info	Informational messages.	Normal operational messages - may be harvested for reporting, measuring throughput, etc. - no action required.
+7	Debug	debug	Debug-level messages.	Info useful to developers for debugging the application, not useful during operations.
+=end

data/lib/logflume/version.rb

@@ -1,3 +1,3 @@
   module Logflume
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logflume
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shadowbq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: directory_watcher
@@ -149,6 +149,7 @@ files:
 - lib/logflume.rb
 - lib/logflume/exceptions.rb
 - lib/logflume/flume.rb
+- lib/logflume/syslog_constants.rb
 - lib/logflume/version.rb
 - spec/data/flume/dpkg.log
 - spec/data/flume/test.log