sms-logparser 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f9bdc8815f76a6fbd4265b002e4e542329899f
-  data.tar.gz: a0184b860500317581e80a65fd668a3cf03fd100
+  metadata.gz: 9d9aa56b379edf1fef5f9322463a6fa581d38ff8
+  data.tar.gz: ef45045d3538b34b9612f1fca2b7fe546e5d2583
 SHA512:
-  metadata.gz: 8dc096c7e29ece171eb11ec4e3176f0d7b91a83de32e6076d34389110fe2b0b06bdf0674d59869e95522e121d44673cf42ea2cb730ae506b8f769bd51f4d9ccc
-  data.tar.gz: 1385a1986fffedfd48dd1394c006051065b5e4d41c3cfa5f3ea0ebe350b5a69b671c1357011b66730c56499f78e20d811403af9ce68d4dace15c01d5879534d1
+  metadata.gz: 3a5bd6d467611916e182b95428f2fa49c7ef4131d92e2cd675559344db3b46b20a8376d0f8f9df85b145459fcaf120a2bfca4229fa8fc6f2c8fc76b55960ee3f
+  data.tar.gz: 2324fde02fd0598af49909792cc928728d79cfd4117598f369e8ee90db43c658d1ccd8c0bb6a7d761309d12ced9a508f5c7f426dbbbde5059f129b8e56083c98

data/lib/sms-logparser/cli.rb

@@ -59,6 +59,10 @@ module SmsLogparser
     def parse
       say "Starting the parser...", :green
       mysql = Mysql.new(options)
+      if mysql.parser_running?
+        say "Aborting. Another instance of the parser is already running.", :red
+        exit
+      end
       state = {
         last_event_id: mysql.get_last_parse_id, 
         match_count: 0,
@@ -66,26 +70,29 @@ module SmsLogparser
         run_at: Time.now,
         run_time: 0.0
       }
+      state = mysql.start_run(state) unless options[:simulate]
       api = Api.new(options)
       mysql.get_entries(last_id: state[:last_event_id], limit: options[:limit]) do |entries|
         entries.each do |entry| 
-          if data = Parser.extract_data_from_msg(entry['Message'])
-            uris = api.send(data)
-            state[:last_event_id] = entry['ID']
+          Parser.extract_data_from_msg(entry['Message']) do |data|
+            urls = api.send(data)
             state[:match_count] += 1
-            verbose_parser_output(data, uris, entry) if options[:verbose]
+            verbose_parser_output(data, urls, entry) if options[:verbose]
           end
+          state[:last_event_id] = entry['ID']
         end
       end
     rescue => e
       say "Error: #{e.message}", :red
       say "Aborting parser run...", :red
-      state[:status] = STATUS[:api_error]
+      state[:status] = STATUS[:api_error] if state
     ensure
       begin
-        state[:run_time] = (Time.now - state[:run_at]).round(2)
-        mysql.write_parse_result(state) unless options[:simulate]
-        print_parse_results(state)
+        if mysql
+          state[:run_time] = (Time.now - state[:run_at]).round(2)
+          mysql.write_parse_result(state) unless options[:simulate]
+          print_parse_results(state)
+        end
       rescue => e
         say "Error: #{e.message}", :red
         say(e.backtrace.join("\n"), :yellow) if options[:debug]
@@ -142,7 +149,7 @@ module SmsLogparser
       def verbose_parser_output(data, uris, entry)
         say "ID:\t", :cyan
         say entry['ID']
-        say "URI:\t", :cyan
+        say "URL:\t", :cyan
         say uris.join("\n\t")
         say "Data:\t", :cyan
         say data.map{|k,v| "#{k}:\t#{v}"}.join("\n\t") || "\n"
@@ -158,8 +165,7 @@ module SmsLogparser
         say "#{res[:run_time]}s"
         say "Status:\t\t", :cyan
         say STATUS.key(res[:status]).upcase
-        action = options[:simulate] ? "found" : "sent"
-        say("Events #{action}:\t", :cyan)
+        say("Events #{options[:simulate] ? "found" : "sent"}:\t", :cyan)
         say res[:match_count]
       end
 

data/lib/sms-logparser/mysql.rb

@@ -43,15 +43,36 @@ module SmsLogparser
       return 0
     end
 
-    def write_parse_result(options={})
+    def parser_running?(running_state = 3)
+      last_parse = client.query(
+        "SELECT status FROM sms_logparser_runs ORDER BY id DESC LIMIT 1"
+      )
+      if entry = last_parse.first
+        return false unless entry['status'] == running_state
+      end
+      false
+    end
+
+    def start_run(options)
       client.query(
-        "INSERT INTO sms_logparser_runs(run_at, last_event_id, match_count, status, run_time)\
-        VALUES(\
+        "INSERT INTO sms_logparser_runs (run_at, status)\
+        VALUES (\
           '#{options[:run_at].strftime("%Y-%m-%d %H:%M:%S")}',\
-          #{options[:last_event_id]},\
-          #{options[:match_count]},\
-          #{options[:status]},\
-          #{options[:run_time]}
+          #{options[:status]}\
+        )"
+      )
+      options[:id] = client.last_id
+      options
+    end
+
+    def write_parse_result(options)
+      client.query(
+        "UPDATE sms_logparser_runs SET match_count, status, run_time\
+          last_event_id = #{options[:last_event_id]},\
+          match_count = #{options[:match_count]},\
+          status = #{options[:status]},\
+          run_time = #{options[:run_time]}\
+        WHERE id = #{options[id]}
         )"
       )
     end
@@ -65,8 +86,8 @@ module SmsLogparser
       end
       while last_id < max_id
         entries = select_entries(last_id)
-        last_id = entries.to_a[-1]['ID']
         yield entries
+        last_id = entries.to_a[-1]['ID']
       end
     end
 
@@ -79,12 +100,13 @@ module SmsLogparser
 
     private
 
+
+
     def select_entries(last_id)
-      sql = "SELECT * FROM SystemEvents\
+      client.query("SELECT * FROM SystemEvents\
         WHERE `FromHost` like '#{@host_filter}'\
         ORDER BY ID ASC\
-        LIMIT #{last_id},#{@query_limit};"
-      client.query(sql)
+        LIMIT #{last_id},#{@query_limit};")
     end
 
     def get_last_event_id

data/lib/sms-logparser/parser.rb

@@ -7,7 +7,7 @@ module SmsLogparser
         raise "No match found." unless m
         traffic_type = Parser.get_traffic_type(m[6])
         visitor_type = Parser.get_visitor_type(traffic_type, m[4])
-        return {
+        data = {
           :customer_id => m[1],
           :author_id => m[2],
           :project_id => m[3],
@@ -16,7 +16,9 @@ module SmsLogparser
           :user_agent => m[6],
           :traffic_type => traffic_type,
           :visitor_type => visitor_type
-        }
+        } 
+        return data unless block_given?
+        yield data
       end
       nil
     end

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-05 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
@@ -144,17 +144,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.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: sms-logparser - Logparser for Simplex Media Server (SMS)