ntail 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/ntail/formatting.rb

@@ -120,20 +120,30 @@ module Formatting
               if r6
                 r0 = r6
               else
-                r7 = _nt_http_referer
+                r7 = _nt_upstream_response_time
                 if r7
                   r0 = r7
                 else
-                  r8 = _nt_http_user_agent
+                  r8 = _nt_request_time
                   if r8
                     r0 = r8
                   else
-                    r9 = _nt_proxy_addresses
+                    r9 = _nt_http_referer
                     if r9
                       r0 = r9
                     else
-                      @index = i0
-                      r0 = nil
+                      r10 = _nt_http_user_agent
+                      if r10
+                        r0 = r10
+                      else
+                        r11 = _nt_proxy_addresses
+                        if r11
+                          r0 = r11
+                        else
+                          @index = i0
+                          r0 = nil
+                        end
+                      end
                     end
                   end
                 end
@@ -340,6 +350,68 @@ module Formatting
     r0
   end
 
+  module UpstreamResponseTime0
+    def value(log_line, color)
+      foreground(log_line.upstream_response_time, color)
+    end
+  end
+
+  def _nt_upstream_response_time
+    start_index = index
+    if node_cache[:upstream_response_time].has_key?(index)
+      cached = node_cache[:upstream_response_time][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%<T', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 3))
+      r0.extend(UpstreamResponseTime0)
+      @index += 3
+    else
+      terminal_parse_failure('%<T')
+      r0 = nil
+    end
+
+    node_cache[:upstream_response_time][start_index] = r0
+
+    r0
+  end
+
+  module RequestTime0
+    def value(log_line, color)
+      foreground(log_line.request_time, color)
+    end
+  end
+
+  def _nt_request_time
+    start_index = index
+    if node_cache[:request_time].has_key?(index)
+      cached = node_cache[:request_time][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%T', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(RequestTime0)
+      @index += 2
+    else
+      terminal_parse_failure('%T')
+      r0 = nil
+    end
+
+    node_cache[:request_time][start_index] = r0
+
+    r0
+  end
+
   module HttpReferer0
     def value(log_line, color)
       foreground(log_line.to_referer_s, color)

data/lib/ntail/formatting.treetop

@@ -14,7 +14,7 @@ grammar Formatting
   end
 
   rule token
-    remote_addr / remote_user / time_local / request / status / body_bytes_sent / http_referer / http_user_agent / proxy_addresses
+    remote_addr / remote_user / time_local / request / status / body_bytes_sent / upstream_response_time / request_time / http_referer / http_user_agent / proxy_addresses
   end
 
   rule remote_addr
@@ -70,6 +70,22 @@ grammar Formatting
     }
   end
 
+  rule upstream_response_time
+    '%<T' <Node> {
+      def value(log_line, color)
+        foreground(log_line.upstream_response_time, color)
+      end
+    }
+  end
+
+  rule request_time
+    '%T' <Node> {
+      def value(log_line, color)
+        foreground(log_line.request_time, color)
+      end
+    }
+  end
+
   rule http_referer
     '%R' <Node> {
       def value(log_line, color)

data/lib/ntail/log_line.rb

@@ -27,8 +27,8 @@ module NginxTail
 
       # UPSTREAM = NGINX + ...
 
-      :upstream_response_time, # %?
-      :request_time,           # %D
+      :upstream_response_time, #       %<T (seconds, with millisecond resolution)
+      :request_time,           # %T or %>T (seconds, with millisecond resolution) / but also see: %D (microseconds)
 
       # APACHE
 

data/ntail.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ntail"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Vandenberk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntail
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4093058518126792393
+      hash: 648352988503521497
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: