sms-logparser 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ecf60aa0919fc5c4feda7cad7b2f16cc033511
-  data.tar.gz: cc3b510f2b77a00268d7bdad8637d77662ec44c3
+  metadata.gz: be3b90122d60da5a8342511ee4a4aa3879c549a7
+  data.tar.gz: 9928653741ef481378f0761ba5f5d5f25c83bc74
 SHA512:
-  metadata.gz: e4a7b84b75bd442062140a43e22ba8789d6247988e0d215c51f2ed48b75cc4a298a5fa71b486f7aaa8e33272f844280999128d77bb8019f32f81b3e6a59ea3c2
-  data.tar.gz: 79764bdb5af318b498a00880d07981198e204387013b721cf205fd28d78bb7f9dec2dbbd02f2040764d5dc30803fde0e2862ffd501f32bc34977949d253efcfe
+  metadata.gz: bc1cb0028bd7ac7392a7e504aebd6f471b8f636f0983872f7e2f7e23b9dba18eb11359f34714efaf2d49b33aefa849583821a8b003af0bfe82db52961a23830f
+  data.tar.gz: 139425fa7c82772ab61af0c2aefe88acec215177f559f770da307b8df00c4e848e4c834704b73d5c8ea80b47fbcc8fc1280b6d19f0498f519f80b9715151ea98

data/lib/sms-logparser.rb

@@ -8,4 +8,5 @@ require "sms-logparser/mysql"
 require "sms-logparser/parser"
 require "sms-logparser/api"
 require "sms-logparser/loggster"
+require "sms-logparser/data_cache"
 require "sms-logparser/cli"

data/lib/sms-logparser/api.rb

@@ -10,8 +10,11 @@ module SmsLogparser
       @base_path = (@base_url.path << "/").squeeze('/')
       @accepted_responses =  parse_status_codes(options[:accepted_api_responses]) || [200]
       @connection = connection
+      @data_cache = {}
     end
 
+
+
     def send(data)
       requests = build_urls(data)
       return requests if @options[:simulate]
@@ -55,7 +58,7 @@ module SmsLogparser
     private
 
     def connection
-      connection = Faraday.new(url: @url, request: {timeout: 5}) do |faraday|
+      connection = Faraday.new(url: @url, request: {timeout: 20}) do |faraday|
         faraday.request :url_encoded
         faraday.adapter :net_http_persistent
         if @options[:severity] == "debug"

data/lib/sms-logparser/cli.rb

@@ -87,6 +87,27 @@ module SmsLogparser
       end
     end
 
+    desc "cached_pase", "Check the database for pcache logs and put them into the cache"
+    option :limit, type: :numeric, aliases: %w(-L), desc: "Limit the number of entries to query"
+    def cached_parse
+      cache = DataCache.new
+      mysql = Mysql.new(options)
+      say "Getting entries from database..."
+      mysql.get_entries(last_id: mysql.get_last_parse_id, limit: options[:limit]) do |entries|
+        entries.each do |entry| 
+          Parser.extract_data_from_msg(entry['Message']) do |data|
+            if data
+              cache.add(data)
+              say "Cached data ", :magenta
+              say data
+            end
+          end
+        end
+      end
+      puts
+      puts cache.cache
+    end
+
     desc "history", "List the last paser runs"
     option :results, type: :numeric, default: 10, aliases: %w(-n),
       desc: "Number of results to display"

data/lib/sms-logparser/data_cache.rb

@@ -0,0 +1,30 @@
+module SmsLogparser
+  class DataCache
+
+    attr_reader :cache
+
+    def initialize
+      @cache = Hash.new
+      @wanted_keys = [:customer_id, :author_id, :project_id]
+    end
+
+    def add(data)
+      key = [data[:customer_id], data[:author_id], data[:project_id]].join('.')
+      @cache[key] = initialize_value(data) unless @cache.has_key?(key)
+      unless data[:file] =~ /.*\.m3u8$/
+        @cache[key][data[:traffic_type]] = @cache[key][data[:traffic_type]].to_i + data[:bytes].to_i
+      end
+      if data[:visitor_type]
+        @cache[key][data[:visitor_type]] = @cache[key][data[:visitor_type]].to_i + 1
+      end
+      @cache
+    end
+
+    private
+
+    def initialize_value(data)
+      data.select { |key,_| @wanted_keys.include? key }
+    end
+
+  end # class
+end # module

data/lib/sms-logparser/mysql.rb

@@ -79,9 +79,9 @@ module SmsLogparser
 
     def get_entries(options={})
       last_id = options[:last_id] || get_last_parse_id
-      max_id, query_limit = get_query_limits(last_id, options[:limit])
+      max_id = get_max_id(last_id, options[:limit])
       while last_id < max_id
-        entries = select_entries(last_id, query_limit)
+        entries = select_entries(last_id, max_id)
         yield entries
         entries = entries.to_a
         last_id = entries.size > 0 ? entries[-1]['ID'] : max_id
@@ -97,24 +97,20 @@ module SmsLogparser
 
     private
 
-    def get_query_limits(last_id, user_limit = nil)
-      if user_limit
+    def get_max_id(last_id, user_limit = nil)
+      max_id = get_last_event_id
+      if user_limit && user_limit < (max_id - last_id)
         max_id = last_id + user_limit
-        if @query_limit > user_limit
-          query_limit = user_limit
-        end
-      else 
-        max_id = get_last_event_id
       end
-      [max_id, query_limit || @query_limit]
+      max_id
     end
 
-    def select_entries(last_id, max_entries = @query_limit)
+    def select_entries(last_id, max_id)
       query = %Q{
         SELECT ID, Message FROM SystemEvents
-        WHERE ID > #{last_id}
+        WHERE ID BETWEEN #{last_id} AND #{max_id}
         ORDER BY ID ASC
-        LIMIT #{max_entries};
+        LIMIT #{@query_limit};
       }.gsub(/\s+/, " ").strip
       @logger.debug { "Querying for events... (#{query})" }
       client.query(query)

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - niwo
@@ -126,6 +126,7 @@ files:
 - lib/sms-logparser.rb
 - lib/sms-logparser/api.rb
 - lib/sms-logparser/cli.rb
+- lib/sms-logparser/data_cache.rb
 - lib/sms-logparser/loggster.rb
 - lib/sms-logparser/mysql.rb
 - lib/sms-logparser/parser.rb