sms-logparser 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79fdbf9f1e00638b7f470363cb1a436c49dbf5a6
-  data.tar.gz: 59d6c29aa01ffbbb31c4b8924f4c8ccc6ac3faac
+  metadata.gz: fb123379f0d4fe32a268365460e4e916d02b962f
+  data.tar.gz: c2502c598e29d0d284ba10c7e2a3395ee3a2a717
 SHA512:
-  metadata.gz: 1ff73068b045081b7a9ed360092c78a018ace25629eb4cf10f7fa76d531e64deea495da3ba308ec049face623b3972bc83d2614fcc26fecef3088218092b82a4
-  data.tar.gz: 2ea9ba98dc42185dfe262d7ff9e4d4c577d6b49af911550b2edd2cb57402ef7a4ebababe829024085a2bd7aa17b21b017f32556c61bac469c0fee1e9d517862b
+  metadata.gz: f24537178e814531fd41c5cfe060e65f070df80eff68e2ac48b1fd1ebee1d0f269da03d46317aa120db64643488e0419f20c4933457d2f0c39212cf01491a50d
+  data.tar.gz: a91d0bdb92e8543ecd352798cddb5c1c961f8434c10b312538423bda419069935f8e7e256ab295405b4d29bc37724b19c86b220deea6bc83246f517ea2e51400

data/lib/sms-logparser.rb

@@ -7,5 +7,5 @@ require "sms-logparser/version"
 require "sms-logparser/mysql"
 require "sms-logparser/parser"
 require "sms-logparser/api"
-require "sms-logparser/app_logger"
+require "sms-logparser/loggster"
 require "sms-logparser/cli"

data/lib/sms-logparser/api.rb

@@ -1,6 +1,7 @@
 module SmsLogparser
   class Api
     require 'uri'
+    require 'thread'
 
     def initialize(options)
       @options = options
@@ -12,6 +13,28 @@ module SmsLogparser
     end
 
     def send(data)
+      requests = build_urls(data)
+      return requests if @options[:simulate]
+
+      threads = requests.map do |request|
+        Thread.new do
+          begin
+            response = @connection.post(request[:uri])
+            request[:status] = response.status
+          rescue => e
+            raise RuntimeError, "Can't send request to #{request[:uri]}. #{e.message}", caller
+          end
+          unless @accepted_responses.include?(response.status)
+            msg = "Received HTTP status #{response.status} from API. Only accepting #{@accepted_responses.join(', ')}."
+            raise RuntimeError, msg, caller
+          end
+        end
+      end
+      threads.each {|thread| thread.join }
+      requests
+    end
+
+    def build_urls(data)
       requests = []
       path = @base_path + [data[:customer_id], data[:author_id], data[:project_id]].join('/')
       unless data[:file] =~ /.*\.m3u8$/
@@ -26,20 +49,6 @@ module SmsLogparser
           uri: [path, data[:visitor_type], 1].join('/')
         }
       end
-      unless @options[:simulate]
-        requests.each_with_index do |request, i|
-          begin
-            response = @connection.post(request[:uri])
-            requests[i][:status] = response.status
-          rescue => e
-            raise RuntimeError, "Can't send request to #{request[:uri]}. #{e.message}", caller
-          end
-          unless @accepted_responses.include?(response.status)
-            msg = "Received HTTP status #{response.status} from API. Only accepting #{@accepted_responses.join(', ')}."
-            raise RuntimeError, msg, caller
-          end
-        end
-      end
       requests
     end
 
@@ -48,15 +57,11 @@ module SmsLogparser
     def connection
       connection = Faraday.new(url: @url, request: {timeout: 5}) do |faraday|
         faraday.request :url_encoded
-        if @options[:debug]
-          faraday.use Faraday::Response::Logger, SmsLogparser::AppLogger.instance 
-        end
+        faraday.use Faraday::Response::Logger, SmsLogparser::Loggster.instance 
         faraday.adapter :net_http_persistent
       end
       connection.headers[:user_agent] = "sms-logparser v#{SmsLogparser::VERSION}"
-      if @options[:api_key]
-        connection.headers['X-simplex-api-key'] = @options[:api_key]
-      end
+      connection.headers['X-simplex-api-key'] = @options[:api_key] if @options[:api_key]
       connection
     end
 

data/lib/sms-logparser/cli.rb

@@ -9,8 +9,9 @@ module SmsLogparser
       aliases: %w(-c),
       desc: "Configuration file for default options"
 
-    class_option :debug, type: :boolean, desc: "Show debug output"
-    class_option :logfile, desc: "Path to the logfile (Default: STDOUT)"
+    class_option :severity, type: :string, aliases: %w(-S),
+      desc: "Log severity <debug|info|warn|error|fatal> (Default: warn)"
+    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)"
     class_option :mysql_password, aliases: %w(-p), desc: "MySQL password"
@@ -29,7 +30,7 @@ module SmsLogparser
     option :simulate, type: :boolean, aliases: %w(-s),
       desc: "Dry run without submitting any data"
     option :verbose, type: :boolean, aliases: %w(-v), desc: "Verbose output"
-    option :limit, type: :numeric, aliases: %w(-l), desc: "Limit the number of entries to query"
+    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)."
     def parse
@@ -56,18 +57,18 @@ module SmsLogparser
             if data
               requests = api.send(data)
               state[:match_count] += 1
-              verbose_parser_output(entry['ID'], data, requests) if options[:verbose]
+              verbose_parser_output(entry['ID'], data, requests)
               state[:last_event_id] = entry['ID']
             end
           end
         end
       end
     rescue SystemExit, Interrupt
-      logger.error("Received ctrl-c. Stopping the parser run.")
+      logger.error("Received an interrupt. 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]
+      logger.error "Aborting the parser run."
+      logger.error e
       state[:status] = STATUS[:api_error] if state
     else
       state[:status] = STATUS[:ok]
@@ -79,10 +80,10 @@ module SmsLogparser
             mysql.write_parse_result(state) unless options[:simulate]
           end
           log_parse_results(state)
+          SmsLogparser::Loggster.instance.close
         end
       rescue => e
-        logger.fatal(e.message)
-        say(e.backtrace.join("\n"), :yellow) if options[:debug]
+        logger.fatal e
       end
     end
 
@@ -128,23 +129,26 @@ module SmsLogparser
       when 2
         logger.info("Recreated database tables.")
       end
+      SmsLogparser::Loggster.instance.close
     rescue => e
-      logger.fatal(e.message)
-      say(e.backtrace.join("\n"), :yellow) if options[:debug]
+      logger.fatal e
     end
 
     no_commands do
       def logger
-        SmsLogparser::AppLogger.instance.set_log_device(options[:logfile])
+        SmsLogparser::Loggster.instance.set_severity options[:severity]
+        SmsLogparser::Loggster.instance.set_log_device options[:logfile]
       end
 
       def verbose_parser_output(entry_id, data, requests)
-        logger.info {
+        logger.debug {
           "parsing data for #{entry_id} (#{data.map{|k,v| "#{k}=\"#{v || '-'}\""}.join(" ") || ''})"
         }
-        logger.info {
-          "parser urls for entry #{entry_id} (#{requests.map {|req| "#{req[:url]}#{req[:uri]}"}.join(" ")})"
-        }
+        requests.each_with_index do |req, i|
+          logger.debug {
+            "URL #{i + 1} for entry #{entry_id} #{req[:url]}#{req[:uri]}"
+          }
+        end
       end
 
       def table_to_csv(table)

data/lib/sms-logparser/{app_logger.rb → loggster.rb}

@@ -2,7 +2,7 @@ module SmsLogparser
   require 'logger'
   require 'singleton'
 
-  class AppLogger < Logger
+  class Loggster < Logger
     include Singleton
     
     def initialize
@@ -20,5 +20,23 @@ module SmsLogparser
       self
     end
 
+    def set_severity(severity = "info")
+      self.sev_threshold = case severity
+      when "debug"
+        Logger::DEBUG
+      when "info"
+        Logger::INFO
+      when "warn"
+        Logger::WARN
+      when "error"
+        Logger::ERROR
+      when "fatal"
+        Logger::FATAL
+      else 
+        Logger::INFO
+      end
+      self
+    end
+
   end
 end

data/lib/sms-logparser/mysql.rb

@@ -6,7 +6,7 @@ module SmsLogparser
       @host_filter = options[:host_filter] || 'pcache%'
       @query_limit = options[:query_limit] || 1000
       @client = client
-      @logger = SmsLogparser::AppLogger.instance
+      @logger = SmsLogparser::Loggster.instance
     end
 
     def client
@@ -116,7 +116,7 @@ module SmsLogparser
               ID > #{last_id}
         ORDER BY ID ASC
         LIMIT #{max_entries};}.gsub(/\s+/, " ").strip
-      @logger.info("Querying for events... (#{query})") if @options[:debug]
+      @logger.debug { "Querying for events... (#{query})" }
       client.query(query)
     end
 

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.9.6"
+  VERSION = "0.10.0"
 end

data/spec/cli_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+LOGFILE = '/tmp/sms-logparser.log'
+
 describe SmsLogparser::Cli do
   before do
     TestHelper.create_test_db
@@ -11,27 +13,26 @@ describe SmsLogparser::Cli do
 
   after do
     TestHelper.drop_test_db
+    FileUtils.rm(LOGFILE) if File.exists?(LOGFILE)
   end
 
   it "can create the parser_runs database table" do
     parser = TestHelper.sms_logparser
     parser.options[:force] = true
-    out, err = capture_io do
-      parser.setup
-    end
-    out.must_match /.*Created database table./
+    parser.options[:logfile] = LOGFILE
+    parser.setup
+    IO.read(LOGFILE).must_include 'Created database table.'
   end
 
   it "can parse a log database and find matches" do
     TestHelper.seed_db(10)
     parser = TestHelper.sms_logparser
     parser.options[:simulate] = true
+    parser.options[:logfile] = LOGFILE
     #parser.options[:api_base_url] = "http://localhost/creator/rest/"
-    out, err = capture_io do
-      parser.setup
-      parser.parse  
-    end
-    out.must_match /.*match_count=10.*/
+    parser.setup
+    parser.parse
+    IO.read(LOGFILE).must_include 'match_count="10"'
   end
 
   # it "skips over already parsed logs" do
@@ -51,10 +52,11 @@ describe SmsLogparser::Cli do
     parser = TestHelper.sms_logparser
     parser.options[:simulate] = true
     parser.options[:force] = true
+    parser.options[:logfile] = LOGFILE
+    parser.setup
+    parser.parse
 
     out, err = capture_io do
-      parser.setup
-      parser.parse
       parser.history 
     end
     err.must_equal ""

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - niwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 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
@@ -125,8 +125,8 @@ files:
 - bin/sms-logparser
 - lib/sms-logparser.rb
 - lib/sms-logparser/api.rb
-- lib/sms-logparser/app_logger.rb
 - lib/sms-logparser/cli.rb
+- lib/sms-logparser/loggster.rb
 - lib/sms-logparser/mysql.rb
 - lib/sms-logparser/parser.rb
 - lib/sms-logparser/version.rb
@@ -146,17 +146,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)