sms-logparser 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f291bf3366c86a9e0467f9fa4a750c215944b1
-  data.tar.gz: 1e3c5b90c12139143c20c97dfe86c31c0166007f
+  metadata.gz: 3bc6a6c493db206f9b0e26204b31abd83ab8b9fe
+  data.tar.gz: 39672cbbd824b8132d253343add492c2c11ae753
 SHA512:
-  metadata.gz: 47d51297d129e36460d9d9cd8f9a8b868cc7a1b6ca1c2abd68a5e9cef408cb1dc4501f5a4d25aef186594fb9537f9fae338b4e25054f9f5a7140ddab16384781
-  data.tar.gz: 8590d8eca2c7e2385d58927bb6b23ad1b1cb8a5fbc7bb7dd504380a9f06efe7e65126da233cb79fbcc514ace201c75b180720dbb7bf8b58f3630bd219bc91a0e
+  metadata.gz: 1f6a85ed18dec43437b4a2a46014150b6101004d7f3f3ec51df8fc00303b5483171acd6d2fbf50c892d6018cbe825a823ae199920441e3f3954628b6951f8a16
+  data.tar.gz: f2aa9eb052adde2c6af76ef2da369e646cb176d513cf635d2ab4ec3ac335daf9bc415bb51a777081d9fce77608b6a7f012e94561d77e2a17368157d90c34b447

data/README.md

@@ -1,6 +1,6 @@
 # SMS Logparser
 
-sms-logparser - Logparser for Simplex Media Server (SMS). Reads access logs stored in a MySQL database (coming from the SWISS TXT CDN) and sends them to the SMS API.
+sms-logparser - Logparser for Simplex Media Server (SMS). Reads access logs stored in a MySQL database (coming from the SWISS TXT CDN) accumulates and sends them to the SMS API.
 
 [![Gem Version](https://badge.fury.io/rb/sms-logparser.png)](http://badge.fury.io/rb/sms-logparser)
 
@@ -23,7 +23,7 @@ $ sms-logparser setup
 Make a test run:
 
 ```bash
-$ sms-logparser parse --simulate --verbose
+$ sms-logparser parse --simulate
 ```
 
 ## Usage

data/lib/sms-logparser/cli.rb

@@ -29,11 +29,10 @@ module SmsLogparser
     option :api_key, aliases: %w(-k), desc: "SMS API Key"
     option :simulate, type: :boolean, aliases: %w(-s),
       desc: "Dry run without submitting any data"
-    option :verbose, type: :boolean, aliases: %w(-v), desc: "Verbose output"
     option :limit, type: :numeric, aliases: %w(-L), desc: "Limit the number of entries to query"
     option :accepted_api_responses, type: :array, aliases: %w(-r),
       desc: "API HTTP responses which are accepted (Default: only accept 200)"
-    option :accumulate, type: :boolean, aliases: %w(-A),
+    option :accumulate, type: :boolean, aliases: %w(-A), default: true,
       desc: "Accumulate and cache results and send totals"
     option :concurrency, type: :numeric, default: 4, aliases: %w(-C),
       desc: "How many threads to use in parallel when sending cached results"

data/lib/sms-logparser/log_message.rb

@@ -4,32 +4,36 @@ module SmsLogparser
       @message = message
     end
 
+    def match
+      @match ||= @message.match /\/content\/(\d+)\/(\d+)\/+(\d+)\/(\w+\.\w+)*(\?\S*)*\s.*\"\s(\d+)\s(\d+).+"(.*)"$/
+    end
+
     def customer_id
-      match[1]
+      match[1] if match
     end
 
     def author_id
-      match[2]
+      match[2] if match
     end
               
     def project_id
-      match[3]
+      match[3] if match
     end
 
     def file
-      match[4]
+      match[4] if match
     end
 
     def args
-      match[5][1..-1] if match[5]
+      match[5][1..-1] if match && match[5]
     end
 
     def status
-      match[6].to_i
+      match[6].to_i if match
     end
 
     def bytes
-      match[7].to_i
+      match[7].to_i if match
     end
 
     def file_extname
@@ -37,7 +41,7 @@ module SmsLogparser
     end
     
     def user_agent
-      match[8]
+      match[8] if match
     end
 
     def account_info
@@ -61,11 +65,5 @@ module SmsLogparser
     def to_h
       account_info.merge(transfer_info)
     end
-
-    private 
-
-    def match
-      @match ||= @message.match /\/content\/(\d+)\/(\d+)\/(\d+)\/(\w+\.\w+)*(\?\S*)*\s.*\"\s(\d+)\s(\d+).+"(.*)"$/
-    end
   end
 end 

data/lib/sms-logparser/parser.rb

@@ -11,18 +11,22 @@ module SmsLogparser
       if Parser.match?(message)
         @logger.debug { "Parser MATCH: #{message}" }
         log_message = LogMessage.new(message)
-        type = Parser.get_type(log_message.user_agent)
-        data << log_message.account_info.merge(
-          type: "TRAFFIC_#{type}",
-          value: (log_message.bytes * traffic_correction_factor(type)).round(0)
-        )
-        if log_message.status == 200 &&
-          (log_message.file_extname =~ /\.(mp3|mp4|flv|f4v)/ ||
-           log_message.file == 'index.m3u8')
+        unless log_message.match
+          @logger.warn { "Can't extract data from message: #{message}" }
+        else
+          type = Parser.get_type(log_message.user_agent)
           data << log_message.account_info.merge(
-            type: "VISITORS_#{type}",
-            value: 1,
+            type: "TRAFFIC_#{type}",
+            value: (log_message.bytes * traffic_correction_factor(type)).round(0)
           )
+          if log_message.status == 200 &&
+            (log_message.file_extname =~ /\.(mp3|mp4|flv|f4v)/ ||
+             log_message.file == 'index.m3u8')
+            data << log_message.account_info.merge(
+              type: "VISITORS_#{type}",
+              value: 1,
+            )
+          end
         end
       else
         @logger.debug { "Parser IGNORE: #{message}" }

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.15.4"
+  VERSION = "0.15.5"
 end

data/spec/log_message_spec.rb

@@ -41,4 +41,23 @@ describe SmsLogparser::LogMessage do
     log_message.user_agent.must_equal 'Googlebot-Video/1.0'
   end
 
+  it "does not fail on double slashes" do
+    log_message = SmsLogparser::LogMessage.new('- - [23/Apr/2014:23:01:24 +0200] "GET /content/244/245/42601//player_logo.jpg?0.19035581778734922 HTTP/1.1" 200 21671 "http://blick.simplex.tv/content/244/245/42601/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36"')
+    log_message.customer_id.must_equal nil
+    log_message.author_id.must_equal nil
+    log_message.project_id.must_equal nil
+    log_message.status.must_equal nil
+    log_message.bytes.must_equal nil
+    log_message.file.must_equal nil
+    log_message.args.must_equal nil
+    log_message.file_extname.must_equal nil
+    log_message.user_agent.must_equal nil
+    #log_message.status.must_equal 200
+    #log_message.bytes.must_equal 1181
+    #log_message.file.must_equal 'player_logo.jpg'
+    #log_message.args.must_equal '0.19035581778734922'
+    #log_message.file_extname.must_equal 'jpg'
+    #log_message.user_agent.must_equal 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36'
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler