ntail 0.0.11 → 0.0.12

data/lib/ntail/formatting.rb

@@ -96,15 +96,15 @@ module Formatting
     end
 
     i0 = index
-    r1 = _nt_date
+    r1 = _nt_remote_addr
     if r1
       r0 = r1
     else
-      r2 = _nt_referer
+      r2 = _nt_remote_user
       if r2
         r0 = r2
       else
-        r3 = _nt_remote_address
+        r3 = _nt_time_local
         if r3
           r0 = r3
         else
@@ -116,12 +116,27 @@ module Formatting
             if r5
               r0 = r5
             else
-              r6 = _nt_user_agent
+              r6 = _nt_body_bytes_sent
               if r6
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                r7 = _nt_http_referer
+                if r7
+                  r0 = r7
+                else
+                  r8 = _nt_http_user_agent
+                  if r8
+                    r0 = r8
+                  else
+                    r9 = _nt_proxy_addresses
+                    if r9
+                      r0 = r9
+                    else
+                      @index = i0
+                      r0 = nil
+                    end
+                  end
+                end
               end
             end
           end
@@ -134,16 +149,21 @@ module Formatting
     r0
   end
 
-  module Date0
+  module RemoteAddr0
     def value(log_line, color)
-      log_line.to_date_s.foreground(color)
+      if color && Sickill::Rainbow.enabled
+        # 24 = 15 + 9, the extra amount of bytes required for the ANSI escape codes...
+        "%24s" % foreground(log_line.remote_address, color)
+      else
+        "%15s" % log_line.remote_address
+      end
     end
   end
 
-  def _nt_date
+  def _nt_remote_addr
     start_index = index
-    if node_cache[:date].has_key?(index)
-      cached = node_cache[:date][index]
+    if node_cache[:remote_addr].has_key?(index)
+      cached = node_cache[:remote_addr][index]
       if cached
         cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
@@ -151,30 +171,30 @@ module Formatting
       return cached
     end
 
-    if has_terminal?('%d', false, index)
+    if has_terminal?('%a', false, index)
       r0 = instantiate_node(Node,input, index...(index + 2))
-      r0.extend(Date0)
+      r0.extend(RemoteAddr0)
       @index += 2
     else
-      terminal_parse_failure('%d')
+      terminal_parse_failure('%a')
       r0 = nil
     end
 
-    node_cache[:date][start_index] = r0
+    node_cache[:remote_addr][start_index] = r0
 
     r0
   end
 
-  module Referer0
+  module RemoteUser0
     def value(log_line, color)
-      log_line.to_referer_s.foreground(color).inverse
+      foreground(log_line.remote_user, color)
     end
   end
 
-  def _nt_referer
+  def _nt_remote_user
     start_index = index
-    if node_cache[:referer].has_key?(index)
-      cached = node_cache[:referer][index]
+    if node_cache[:remote_user].has_key?(index)
+      cached = node_cache[:remote_user][index]
       if cached
         cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
@@ -182,30 +202,30 @@ module Formatting
       return cached
     end
 
-    if has_terminal?('%f', false, index)
+    if has_terminal?('%u', false, index)
       r0 = instantiate_node(Node,input, index...(index + 2))
-      r0.extend(Referer0)
+      r0.extend(RemoteUser0)
       @index += 2
     else
-      terminal_parse_failure('%f')
+      terminal_parse_failure('%u')
       r0 = nil
     end
 
-    node_cache[:referer][start_index] = r0
+    node_cache[:remote_user][start_index] = r0
 
     r0
   end
 
-  module RemoteAddress0
+  module TimeLocal0
     def value(log_line, color)
-  		"%#{Sickill::Rainbow.enabled ? 15 + 9 : 15}s" % log_line.remote_address.foreground(color)
+      foreground(log_line.to_date_s, color)
     end
   end
 
-  def _nt_remote_address
+  def _nt_time_local
     start_index = index
-    if node_cache[:remote_address].has_key?(index)
-      cached = node_cache[:remote_address][index]
+    if node_cache[:time_local].has_key?(index)
+      cached = node_cache[:time_local][index]
       if cached
         cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
@@ -213,23 +233,23 @@ module Formatting
       return cached
     end
 
-    if has_terminal?('%a', false, index)
+    if has_terminal?('%t', false, index)
       r0 = instantiate_node(Node,input, index...(index + 2))
-      r0.extend(RemoteAddress0)
+      r0.extend(TimeLocal0)
       @index += 2
     else
-      terminal_parse_failure('%a')
+      terminal_parse_failure('%t')
       r0 = nil
     end
 
-    node_cache[:remote_address][start_index] = r0
+    node_cache[:time_local][start_index] = r0
 
     r0
   end
 
   module Request0
     def value(log_line, color)
-  		log_line.to_request_s.foreground(color)
+      foreground(log_line.to_request_s, color)
     end
   end
 
@@ -260,7 +280,7 @@ module Formatting
 
   module Status0
     def value(log_line, color)
-      log_line.status.foreground(color)
+      foreground(log_line.status, color)
     end
   end
 
@@ -289,16 +309,16 @@ module Formatting
     r0
   end
 
-  module UserAgent0
+  module BodyBytesSent0
     def value(log_line, color)
-      log_line.to_agent_s.foreground(color)
+      foreground(log_line.body_bytes_sent, color)
     end
   end
 
-  def _nt_user_agent
+  def _nt_body_bytes_sent
     start_index = index
-    if node_cache[:user_agent].has_key?(index)
-      cached = node_cache[:user_agent][index]
+    if node_cache[:body_bytes_sent].has_key?(index)
+      cached = node_cache[:body_bytes_sent][index]
       if cached
         cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
@@ -306,16 +326,109 @@ module Formatting
       return cached
     end
 
-    if has_terminal?('%u', false, index)
+    if has_terminal?('%b', false, index)
       r0 = instantiate_node(Node,input, index...(index + 2))
-      r0.extend(UserAgent0)
+      r0.extend(BodyBytesSent0)
       @index += 2
     else
-      terminal_parse_failure('%u')
+      terminal_parse_failure('%b')
+      r0 = nil
+    end
+
+    node_cache[:body_bytes_sent][start_index] = r0
+
+    r0
+  end
+
+  module HttpReferer0
+    def value(log_line, color)
+      foreground(log_line.to_referer_s, color)
+    end
+  end
+
+  def _nt_http_referer
+    start_index = index
+    if node_cache[:http_referer].has_key?(index)
+      cached = node_cache[:http_referer][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%R', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(HttpReferer0)
+      @index += 2
+    else
+      terminal_parse_failure('%R')
+      r0 = nil
+    end
+
+    node_cache[:http_referer][start_index] = r0
+
+    r0
+  end
+
+  module HttpUserAgent0
+    def value(log_line, color)
+      foreground(log_line.to_agent_s, color)
+    end
+  end
+
+  def _nt_http_user_agent
+    start_index = index
+    if node_cache[:http_user_agent].has_key?(index)
+      cached = node_cache[:http_user_agent][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%U', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(HttpUserAgent0)
+      @index += 2
+    else
+      terminal_parse_failure('%U')
+      r0 = nil
+    end
+
+    node_cache[:http_user_agent][start_index] = r0
+
+    r0
+  end
+
+  module ProxyAddresses0
+    def value(log_line, color)
+      (log_line.proxy_addresses || []).join(", ").foreground(color)
+    end
+  end
+
+  def _nt_proxy_addresses
+    start_index = index
+    if node_cache[:proxy_addresses].has_key?(index)
+      cached = node_cache[:proxy_addresses][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%p', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(ProxyAddresses0)
+      @index += 2
+    else
+      terminal_parse_failure('%p')
       r0 = nil
     end
 
-    node_cache[:user_agent][start_index] = r0
+    node_cache[:proxy_addresses][start_index] = r0
 
     r0
   end

data/lib/ntail/formatting.treetop

@@ -14,29 +14,34 @@ grammar Formatting
   end
 
   rule token
-    date / referer / remote_address / request / status / user_agent
+    remote_addr / remote_user / time_local / request / status / body_bytes_sent / http_referer / http_user_agent / proxy_addresses
   end
 
-  rule date
-    '%d' <Node> {
+  rule remote_addr
+    '%a' <Node> {
       def value(log_line, color)
-        log_line.to_date_s.foreground(color)
+        if color && Sickill::Rainbow.enabled
+          # 24 = 15 + 9, the extra amount of bytes required for the ANSI escape codes...
+          "%24s" % foreground(log_line.remote_address, color)
+        else
+          "%15s" % log_line.remote_address
+        end
       end
     }
   end
 
-  rule referer
-    '%f' <Node> {
+  rule remote_user
+    '%u' <Node> {
       def value(log_line, color)
-        log_line.to_referer_s.foreground(color).inverse
+        foreground(log_line.remote_user, color)
       end
     }
   end
 
-  rule remote_address
-    '%a' <Node> {
+  rule time_local
+    '%t' <Node> {
       def value(log_line, color)
-    		"%#{Sickill::Rainbow.enabled ? 15 + 9 : 15}s" % log_line.remote_address.foreground(color)
+        foreground(log_line.to_date_s, color)
       end
     }
   end
@@ -44,7 +49,7 @@ grammar Formatting
   rule request
     '%r' <Node> {
       def value(log_line, color)
-    		log_line.to_request_s.foreground(color)
+        foreground(log_line.to_request_s, color)
       end
     }
   end
@@ -52,15 +57,39 @@ grammar Formatting
   rule status
     '%s' <Node> {
       def value(log_line, color)
-        log_line.status.foreground(color)
+        foreground(log_line.status, color)
       end
     }
   end
 
-  rule user_agent
-    '%u' <Node> {
+  rule body_bytes_sent
+    '%b' <Node> {
+      def value(log_line, color)
+        foreground(log_line.body_bytes_sent, color)
+      end
+    }
+  end
+
+  rule http_referer
+    '%R' <Node> {
+      def value(log_line, color)
+        foreground(log_line.to_referer_s, color)
+      end
+    }
+  end
+
+  rule http_user_agent
+    '%U' <Node> {
+      def value(log_line, color)
+        foreground(log_line.to_agent_s, color)
+      end
+    }
+  end
+
+  rule proxy_addresses
+    '%p' <Node> {
       def value(log_line, color)
-        log_line.to_agent_s.foreground(color)
+        (log_line.proxy_addresses || []).join(", ").foreground(color)
       end
     }
   end

data/lib/ntail/http_method.rb

@@ -21,7 +21,7 @@ module NginxTail
         end
 
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'http_method'" unless base.instance_methods.include? 'http_method'
+        raise "Class #{base.name} should implement instance method 'http_method'" unless base.instance_methods.map(&:to_s).include? 'http_method'
         
       end
     end
@@ -31,4 +31,4 @@ module NginxTail
     end
     
   end
-end
+end

data/lib/ntail/http_referer.rb

@@ -56,7 +56,7 @@ module NginxTail
         end
         
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'http_referer'" unless base.instance_methods.include? 'http_referer'
+        raise "Class #{base.name} should implement instance method 'http_referer'" unless base.instance_methods.map(&:to_s).include? 'http_referer'
 
       end
     end
@@ -78,4 +78,4 @@ module NginxTail
     end
 
   end
-end
+end

data/lib/ntail/http_user_agent.rb

@@ -16,6 +16,7 @@ class SearchBot < Agent
   end
   
   #
+  # Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; feed-id=17168503030479467473)
   # Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
   # Googlebot-Image/1.0
   # msnbot/2.0b (+http://search.msn.com/msnbot.htm)
@@ -29,6 +30,7 @@ class SearchBot < Agent
   #
 
   KNOWN_SEARCH_BOTS = [
+     GOOGLE_RSS = Regexp.compile('Feedfetcher-Google.*\/'),
      GOOGLE_BOT = Regexp.compile('Googlebot.*\/'),
         MSN_BOT = Regexp.compile('msnbot\/'),
       YAHOO_BOT = Regexp.compile('Yahoo! Slurp\/?'),
@@ -103,7 +105,7 @@ module NginxTail
         end
 
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'http_user_agent'" unless base.instance_methods.include? 'http_user_agent'
+        raise "Class #{base.name} should implement instance method 'http_user_agent'" unless base.instance_methods.map(&:to_s).include? 'http_user_agent'
         
       end
     end

data/lib/ntail/http_version.rb

@@ -4,18 +4,33 @@ module NginxTail
     def self.included(base) # :nodoc:
       base.class_eval do
 
-        def self.to_http_version_s(http_version)
-          http_version || "" # will be nil if $request == "-" (ie. "dodgy" HTTP requests)
+        @@http_version_expression = Regexp.compile('HTTP/([0-9])\.([0-9])')
+
+        def self.minor_version(http_version)
+          return $1 if http_version =~ @@http_version_expression
+        end
+
+        def self.major_version(http_version)
+          return $1 if http_version =~ @@http_version_expression
+        end
+
+        def self.to_http_version_s(http_version, which = :full)
+          # http_version will be nil if $request == "-" (ie. "dodgy" HTTP requests)
+          http_version.nil? ? "" : case which
+            when :full then http_version
+            when :major then self.major_version(http_version)
+            when :minor then self.minor_version(http_version)
+          end
         end
 
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'http_version'" unless base.instance_methods.include? 'http_version'
+        raise "Class #{base.name} should implement instance method 'http_version'" unless base.instance_methods.map(&:to_s).include? 'http_version'
         
       end
     end
 
-    def to_http_version_s
-      self.class.to_http_version_s(self.http_version)
+    def to_http_version_s(which = :full)
+      self.class.to_http_version_s(self.http_version, which)
     end
     
   end

data/lib/ntail/known_ip_addresses.rb

@@ -31,7 +31,7 @@ module NginxTail
         end
 
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.include? 'remote_addr'
+        raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.map(&:to_s).include? 'remote_addr'
         
       end
     end
@@ -41,4 +41,4 @@ module NginxTail
     end
     
   end
-end
+end

data/lib/ntail/local_ip_addresses.rb

@@ -31,7 +31,7 @@ module NginxTail
         end
 
         # this ensures the below module methods actually make sense...
-        raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.include? 'remote_addr'
+        raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.map(&:to_s).include? 'remote_addr'
         
       end
     end
@@ -41,4 +41,4 @@ module NginxTail
     end
     
   end
-end
+end