loghandler 0.0.6 → 0.0.7

data/lib/loghandler.rb

@@ -14,6 +14,20 @@ require "loghandler/rules/abstract_rule"
 require "loghandler/rules/thin_access_log_rule"
 require "loghandler/rules/on_radio_log_rule"
 require "loghandler/rules/generic_log_rule"
+require "loghandler/rules/generic_error_log_rule"
 
 module Loghandler
 end
+
+# monkey patch
+class String
+  def underscore
+    word = self.dup
+    word.gsub!(/::/, '/')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+end

data/lib/loghandler/rules/abstract_rule.rb

@@ -5,7 +5,8 @@ module Loghandler
         raise "initialize is abstract. Provide an implementation"
       end
       def match?
-        raise "match? is abstract. Provide an implementation"
+        return true if self.class.name.underscore == ["loghandler/rules/",@log_detail[:log_type], "_rule"].join
+        return false
       end
       def apply!
         raise "convert is abstract. Provide an implementation"

data/lib/loghandler/rules/generic_error_log_rule.rb

@@ -0,0 +1,26 @@
+module Loghandler
+  module Rules
+
+    class GenericErrorLogRule < AbstractRule
+      def initialize(log_detail)
+        @log_detail=log_detail
+      end
+      def apply!
+        @log_detail[:severity]="error"
+      end
+      def log
+       @log_detail.to_json
+      end
+      def loggable?
+        true
+      end
+      def persist?
+        false
+      end
+      def showable?
+        true
+      end
+    end
+
+  end
+end

data/lib/loghandler/rules/generic_log_rule.rb

@@ -5,11 +5,6 @@ module Loghandler
       def initialize(log_detail)
         @log_detail=log_detail
       end
-      def match?
-        return true if "generic_log" == @log_detail[:log_type]
-        # return true if (@log_detail[:content].match(/RTL2/))
-        return false
-      end
       def apply!
       end
       def log

data/lib/loghandler/rules/thin_access_log_rule.rb

@@ -5,11 +5,6 @@ module Loghandler
       def initialize(log_detail)
         @log_detail=log_detail
       end
-      def match?
-        return true if "thin_access_log"==@log_detail[:log_type]
-        # return true if (@log_detail[:content].match(/RTL2/))
-        return false
-      end
       def apply!
         log_detail = {}
         tmp = CSV.parse(@log_detail[:content],col_sep:" ")
@@ -17,13 +12,19 @@ module Loghandler
         log_detail[:ip] = tmp[0]
         log_detail[:date] = tmp[3]+tmp[4]
         log_detail[:url]=tmp[5]
-        log_detail[:status]=tmp[6]
-        log_detail[:length]=tmp[7]
+        log_detail[:status]=tmp[6].to_i
+        log_detail[:length]=tmp[7].to_i
         log_detail[:referer]=tmp[8]
         log_detail[:user_agent]=tmp[9]
         #p  [log_detail[:url],log_detail[:status]]
-
         @log_detail.merge!(log_detail)
+        if @log_detail[:status]>=500
+          @log_detail[:severity]="error"
+        elsif @log_detail[:status]>=400
+          @log_detail[:severity]="warning"
+        else
+          @log_detail[:severity]="none"
+        end
       end
       def log
        @log_detail.to_json

data/lib/loghandler/server.rb

@@ -5,6 +5,10 @@ class Loghandler::Server < EM::Connection
   
   include MongoMapper
 
+  def initialize(ws_channel)
+    @ws_channel = ws_channel
+    super
+  end
 
   def post_init
     @rules=Loghandler::Rules.constants.select {|c| Class === Loghandler::Rules.const_get(c)}
@@ -28,7 +32,7 @@ class Loghandler::Server < EM::Connection
     detect_matching_rules(log_detail).each do |rule|
       rule.apply!
       # puts "logging: #{rule.log}" if !rule.loggable?
-      @@ws_channel.push(rule.log) if rule.loggable?
+      @ws_channel.push(rule.log) if rule.loggable?
     end
     
   end
@@ -59,20 +63,18 @@ class Loghandler::Server < EM::Connection
     MongoMapper.database = "loghandler"
 
     EM.run do
-      @@ws_channel = EventMachine::Channel.new
-
+      ws_channel = EventMachine::Channel.new
       Signal.trap("INT") do
         EM.stop
       end
-      EventMachine.start_server options[:url], options[:port], Loghandler::Server 
+      EventMachine.start_server options[:url], options[:port], Loghandler::Server, ws_channel
       
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws|
-          @@ws_channel.subscribe do |msg|
-            ws.send msg
+          ws.onopen do
+            ws_channel.subscribe do |msg|
+              ws.send msg 
+            end
           end
-          # ws.onopen {
-          #   puts "WebSocket connection open"
-          # }
           # ws.onclose { puts "Connection closed" }
           # ws.onmessage { |msg|
           #   puts "Recieved message: #{msg}"

data/lib/loghandler/version.rb

@@ -1,3 +1,3 @@
 module Loghandler
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loghandler
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -127,6 +127,7 @@ files:
 - lib/loghandler/client.rb
 - lib/loghandler/log_detail.rb
 - lib/loghandler/rules/abstract_rule.rb
+- lib/loghandler/rules/generic_error_log_rule.rb
 - lib/loghandler/rules/generic_log_rule.rb
 - lib/loghandler/rules/on_radio_log_rule.rb
 - lib/loghandler/rules/thin_access_log_rule.rb