sms-logparser 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12c5dc49cbd6bb815c90feb4433fa6e36126de92
-  data.tar.gz: 02ebecafd7879b73ccf498a52183bda282df8d50
+  metadata.gz: 7f709270361f9f1208232317d9b37aba1e9aae77
+  data.tar.gz: f516c9dee65ec36ec8c9a4f41652a3e42a1f15bf
 SHA512:
-  metadata.gz: d786e3685cecbc0d7d0c091ecbce774a3a3a1110719d02c360dc19da43054562a8c2055d99f6e7cc3138ce1fdc4a22f08aee5f38c4e0e70a9b234b46443a6043
-  data.tar.gz: 3b4bb19d2e5149faecb5cf799b6baae9fea425d250be039150a1fb8575538555da907a66e6a4771db465cfdd5da5c3d0c9c28eb93d4270e1d0ac9bb29c8ef97e
+  metadata.gz: 4d726d6420de339030ed9e2f2ec0275968197e2bad698f8098465f9cad536315cdabe929732c2cceaf3237a789c24f608ba19a44b2977ee29cf83ec912d68b06
+  data.tar.gz: b6d23da0d26577d621b186e6676edf80050c924e0388f0ddda401ea091a8c88d7612b4fcd23b812693ea748baea2534b52a7603a007cc25a0523fefb168c7830

data/lib/sms-logparser/cli.rb

@@ -32,15 +32,22 @@ module SmsLogparser
     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)."
+      desc: "API HTTP responses which are accepted (Default: only accept 200)"
     option :accumulate, type: :boolean, aliases: %w(-A),
       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"
+    option :webcast_traffic_correction, type: :numeric, aliases: %w(-W),
+      desc: "Correction factor for webcast traffic"
+    option :mobile_traffic_correction, type: :numeric, aliases: %w(-M),
+      desc: "Correction factor for mobile traffic"
+    option :podcast_traffic_correction, type: :numeric, aliases: %w(-P),
+      desc: "Correction factor for podcast traffic"
     def parse
       start_message = "Parser started"
       start_message += options[:simulate] ? " in simulation mode." : "."
       logger.info(start_message)
+      parser = Parser.new(options)
       cache = DataCache.new if options[:accumulate]
       mysql = Mysql.new(options)
       if !options[:simulate] && mysql.parser_running?
@@ -60,7 +67,7 @@ module SmsLogparser
       mysql.get_entries(last_id: state[:last_event_id], limit: options[:limit]) do |entries|
         logger.info { "Getting log messages from database..." }
         entries.each do |entry| 
-          Parser.extract_data_from_msg(entry['Message']) do |data|
+          parser.extract_data_from_msg(entry['Message']) do |data|
             if data
               if options[:accumulate]
                 cache.add(data)

data/lib/sms-logparser/parser.rb

@@ -1,10 +1,15 @@
 module SmsLogparser
   class Parser
 
-    def self.extract_data_from_msg(message)
+    def initialize(options)
+      @options = options
+      @logger = SmsLogparser::Loggster.instance
+    end
+
+    def extract_data_from_msg(message)
       data = nil
-      if self.match?(message)
-        SmsLogparser::Loggster.instance.debug { "Parser MATCH: #{message}" }
+      if Parser.match?(message)
+        @logger.debug { "Parser MATCH: #{message}" }
         match = message.match /\/content\/(\d+)\/(\d+)\/(\d+)\/(\w+\.\w+)\s.*\"\s\d+\s(\d+).+"(.*)"$/
         if match
           traffic_type = Parser.get_traffic_type(match[6])
@@ -14,19 +19,33 @@ module SmsLogparser
             :author_id => match[2],
             :project_id => match[3],
             :file =>  match[4],
-            :bytes => match[5],
+            :bytes => (match[5].to_f * traffic_correction_factor(traffic_type)).round(0),
             :user_agent => match[6],
             :traffic_type => traffic_type,
             :visitor_type => visitor_type
           }
         end
       else
-        SmsLogparser::Loggster.instance.debug { "Parser IGNORE: #{message}" }
+        @logger.debug { "Parser IGNORE: #{message}" }
       end
       return data unless block_given?
       yield data
     end
 
+    def traffic_correction_factor(traffic_type)
+      factor = case traffic_type
+      when 'TRAFFIC_WEBCAST'
+        @options[:webcast_traffic_correction] || 1.0
+      when 'TRAFFIC_MOBILE'
+        @options[:mobile_traffic_correction] || 1.0
+      when 'TRAFFIC_PODCAST'
+        @options[:podcast_traffic_correction] || 1.0
+      else
+        1.0
+      end
+      factor.to_f
+    end
+
     def self.match?(message)
       match = message.match(/\/content\/.+\/(\S+) .+ (200|206)/i)
       # ignore detect.mp4 and index.m3u8 

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.13.4"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.4
 description: Reads access logs stored in a MySQL database (coming from the SWISS TXT
@@ -117,7 +117,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: sms-logparser - Logparser for Simplex Media Server (SMS)