sms-logparser 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9aa56b379edf1fef5f9322463a6fa581d38ff8
-  data.tar.gz: ef45045d3538b34b9612f1fca2b7fe546e5d2583
+  metadata.gz: 296d8d061cd01d90fe03d842a78bdbf343e512ef
+  data.tar.gz: 7ead0d25faed08ce7fe3082a06d8d14dfbb67f76
 SHA512:
-  metadata.gz: 3a5bd6d467611916e182b95428f2fa49c7ef4131d92e2cd675559344db3b46b20a8376d0f8f9df85b145459fcaf120a2bfca4229fa8fc6f2c8fc76b55960ee3f
-  data.tar.gz: 2324fde02fd0598af49909792cc928728d79cfd4117598f369e8ee90db43c658d1ccd8c0bb6a7d761309d12ced9a508f5c7f426dbbbde5059f129b8e56083c98
+  metadata.gz: 6c7fa5bdc80e292209795d134f4c56a5e2c73abcf985e18413cbbe741a09529408e1c0262f33925a9839b194a625eb4c32dc8accc678a726d916c42e9673b81d
+  data.tar.gz: a8bb321f3ecaa98b60a4d0144db508b1b61e718bdf082a2747e8ddadeafb51b03a89173a00f006c40c0b6c5e3b93d9d048bdaef3475be2099d64e9b39effc807

data/lib/sms-logparser/cli.rb

@@ -2,7 +2,7 @@ module SmsLogparser
   class Cli < Thor
     require 'yaml'
 
-    STATUS = {ok: 0, api_error: 1}
+    STATUS = {ok: 0, api_error: 1, running: 3}
 
     class_option :config, 
       default: File.join(Dir.home, '.sms-logparser.yml'),
@@ -59,14 +59,14 @@ 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
+      if !options[:simulate] && mysql.parser_running?
+        say "Exit. Another instance of the parser is already running.", :yellow
         exit
       end
       state = {
         last_event_id: mysql.get_last_parse_id, 
         match_count: 0,
-        status: STATUS[:ok],
+        status: STATUS[:running],
         run_at: Time.now,
         run_time: 0.0
       }
@@ -82,15 +82,18 @@ module SmsLogparser
           state[:last_event_id] = entry['ID']
         end
       end
+      state[:status] = STATUS[:ok]
     rescue => e
       say "Error: #{e.message}", :red
       say "Aborting parser run...", :red
       state[:status] = STATUS[:api_error] if state
     ensure
       begin
-        if mysql
+        if mysql && state
           state[:run_time] = (Time.now - state[:run_at]).round(2)
-          mysql.write_parse_result(state) unless options[:simulate]
+          if state[:id]
+            mysql.write_parse_result(state) unless options[:simulate]
+          end
           print_parse_results(state)
         end
       rescue => e

data/lib/sms-logparser/mysql.rb

@@ -48,7 +48,7 @@ module SmsLogparser
         "SELECT status FROM sms_logparser_runs ORDER BY id DESC LIMIT 1"
       )
       if entry = last_parse.first
-        return false unless entry['status'] == running_state
+        return entry['status'] == running_state ? true : false
       end
       false
     end
@@ -67,13 +67,12 @@ module SmsLogparser
 
     def write_parse_result(options)
       client.query(
-        "UPDATE sms_logparser_runs SET match_count, status, run_time\
+        "UPDATE sms_logparser_runs SET\
           last_event_id = #{options[:last_event_id]},\
           match_count = #{options[:match_count]},\
           status = #{options[:status]},\
           run_time = #{options[:run_time]}\
-        WHERE id = #{options[id]}
-        )"
+        WHERE id = #{options[:id]}"
       )
     end
 
@@ -100,8 +99,6 @@ module SmsLogparser
 
     private
 
-
-
     def select_entries(last_id)
       client.query("SELECT * FROM SystemEvents\
         WHERE `FromHost` like '#{@host_filter}'\

data/lib/sms-logparser/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - niwo