sms-logparser 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b45a865df500739a1bea384895fbee8fbad15c
-  data.tar.gz: 41b69f59f7d1d691a66e7c0b2cced2ad16e4ec66
+  metadata.gz: ad817588ffc290e40e11563db5d856da73a1c058
+  data.tar.gz: 6a68fbf74e90aed8127c356cb37d2a6e48762172
 SHA512:
-  metadata.gz: 39d0e9abc5cb3777f2b222196b94387ede340817fcf52b58999bc9c93175ae20f156b384940ada9946703799883ed20fb4c3a2f6eb792a7f830cb2f04571eb5f
-  data.tar.gz: 8c3efb728d6c670cdcac62bf9cecbf022d65a2f1dc9e12528dde9aa89e77a0cbcfa6e3ee4e8d416606edf00f5bbcecedab0aad51059bea24d41be265420f369c
+  metadata.gz: af70780b477df0155f6fe10d06ea02327f7879c4cca38f413778345f3318f531a60a84de91b27124c874ee6911f402520953b9dded8c96de31fd775a1e195d3d
+  data.tar.gz: 099385b75fb60fa67bc62d002c84d35007870a727af9b4a534cd3332a5eab6a3b30a95e515c6dc42b3c31b633fe3d87e2b4557e63b967879e34b4d93a3af058e

data/lib/sms-logparser/api.rb

@@ -52,21 +52,20 @@ module SmsLogparser
                 data[:value]
               ].join('/')
               if @options[:simulate]
-                semaphore.synchronize {
-                  yield url, 0
-                }
-                break
+                status = 200
+              else
+                response = @connection.post(url)
+                status = response.status
               end
-              response = @connection.post(url)
             rescue => e
               raise RuntimeError, "Can't send request to #{url}. #{e.message}", caller
             end
-            unless @accepted_responses.include?(response.status)
-              msg = "Received HTTP status #{response.status} from API. Only accepting #{@accepted_responses.join(', ')}."
+            unless @accepted_responses.include?(status)
+              msg = "Received HTTP status #{status} from API. Only accepting #{@accepted_responses.join(', ')}."
               raise RuntimeError, msg, caller
             end
             semaphore.synchronize {
-              yield url, response.status
+              yield url, status
             }
           end
         end

data/lib/sms-logparser/cli.rb

@@ -10,7 +10,7 @@ module SmsLogparser
       desc: "Configuration file for default options"
 
     class_option :severity, type: :string, aliases: %w(-S),
-      desc: "Log severity <debug|info|warn|error|fatal> (Default: warn)"
+      desc: "Log severity <DEBUG|INFO|WARN|ERROR|FATAL> (Default: INFO)"
     class_option :logfile, desc: "Path to the logfile (Default: STDOUT)", aliases: %w(-l)
     class_option :mysql_host, aliases: %w(-h), desc: "MySQL host"
     class_option :mysql_user, aliases: %w(-u), desc: "MySQL user (Default: root)"
@@ -33,17 +33,19 @@ module SmsLogparser
     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)."
-    option :cache, type: :boolean, desc: "Accumulate and cache results and send totals"
-    option :concurrency, type: :numeric, default: 4,
+    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"
     def parse
       start_message = "Parser started"
       start_message += options[:simulate] ? " in simulation mode." : "."
       logger.info(start_message)
-      cache = DataCache.new if options[:cache]
+      cache = DataCache.new if options[:accumulate]
       mysql = Mysql.new(options)
       if !options[:simulate] && mysql.parser_running?
         logger.warn("Exit. Another instance of the parser is already running.")
+        SmsLogparser::Loggster.instance.close
         exit!
       end
       state = {
@@ -56,10 +58,11 @@ module SmsLogparser
       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|
+        logger.info { "Getting log messages from database..." }
         entries.each do |entry| 
           Parser.extract_data_from_msg(entry['Message']) do |data|
             if data
-              if options[:cache]
+              if options[:accumulate]
                 cache.add(data)
                 logger.debug {"Cached data: #{data}"}
               else
@@ -72,7 +75,7 @@ module SmsLogparser
           end
         end
       end
-      if options[:cache]
+      if options[:accumulate]
         api.send_sets(cache.data_sets, options[:concurrency]) do |url, response|
           logger.info { "POST #{url} (#{response})" }
         end

data/lib/sms-logparser/loggster.rb

@@ -20,17 +20,17 @@ module SmsLogparser
       self
     end
 
-    def set_severity(severity = "info")
+    def set_severity(severity = :info)
       self.sev_threshold = case severity
-      when "debug"
+      when "DEBUG" || :debug
         Logger::DEBUG
-      when "info"
+      when "INFO" || :info
         Logger::INFO
-      when "warn"
+      when "WARN" || :warn
         Logger::WARN
-      when "error"
+      when "ERROR" || :error
         Logger::ERROR
-      when "fatal"
+      when "FATAL" || :fatal
         Logger::FATAL
       else 
         Logger::INFO

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.12.2"
+  VERSION = "0.12.4"
 end

metadata

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