sms-logparser 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fac9c96baa3c274703e6c60512a75fc174995ee
-  data.tar.gz: 626cb1e6734e81e102f2581a16349a37345d1413
+  metadata.gz: d70a14ef332e68862173b564d1c89cafee7a5356
+  data.tar.gz: 780c686b7c57fa984a29eb6d48afc966fb2575c0
 SHA512:
-  metadata.gz: 83355d01a4750e035cd2bf46b428fe6234742615397d158a953548cafaeb5ed9a5422e9267580ebb75f70d32545becc57a29c30b0f4a59b7320b328716a4649f
-  data.tar.gz: b942830d9681a2ab991767a1b0b630b16e3f22f9e5411a21925644075baf21b6236bb57116440248adc9c9290f5ea388cf40b93641a73cb761cbd34717c97a4d
+  metadata.gz: 1b9f1960425e42ecc1662574afe20d365ad1e86f02e4b9bac218000a289c89ea4c2b4ee1be43e2d6d23f1c5f9d6be9651bfb08a96c915b9d09551e46321ab8b3
+  data.tar.gz: 8749f4af2be7264be60bbbb32c343c933d7ee53b5ff1586583b5fd858558c816521cb247fd6aba0f99ea1360eaaa2676c7ca67ab3d125905241382770adb7db0

data/lib/sms-logparser/cli.rb

@@ -2,7 +2,7 @@ module SmsLogparser
   class Cli < Thor
     require 'yaml'
 
-    STATUS = {ok: 0, api_error: 1, running: 3}
+    STATUS = {ok: 0, api_error: 1, running: 3, interrupted: 4}
 
     class_option :config, 
       default: File.join(Dir.home, '.sms-logparser.yml'),
@@ -62,11 +62,15 @@ module SmsLogparser
           end
         end
       end
-      state[:status] = STATUS[:ok]
+    rescue SystemExit, Interrupt
+      logger.error("Received ctrl-c. Stopping the parser run.")
+      state[:status] = STATUS[:interrupted] if state
     rescue => e
       logger.error("#{e.message}. Aborting the parser run.")
       say(e.backtrace.join("\n"), :yellow) if options[:debug]
       state[:status] = STATUS[:api_error] if state
+    else
+      state[:status] = STATUS[:ok]
     ensure
       begin
         if mysql && state

data/lib/sms-logparser/mysql.rb

@@ -117,14 +117,14 @@ module SmsLogparser
         ORDER BY ID ASC
         LIMIT #{max_entries};}.gsub(/\s+/, " ").strip
       @logger.info("Querying for events... (#{query})") if @options[:debug]
-      client.query(query)
+      client.query(query, cache_rows: false)
     end
 
     def get_last_event_id
       last_event = client.query(
-        "SELECT ID FROM SystemEvents ORDER BY ID DESC LIMIT 1"
+        "SELECT MAX(ID) as max_id FROM SystemEvents"
       )
-      last_event.first ? last_event.first['ID'] : 0
+      last_event.first ? last_event.first['max_id'] : 0
     end
 
     def parser_table_exists?

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

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