loggie 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f5379f3de4e3589a9e4932702b79244c6f26a1a
-  data.tar.gz: a80e9996174e3a85fdfad3f5ac0aad08a3626404
+  metadata.gz: e31a124d2613c8265e77ced8b46e352287a03980
+  data.tar.gz: 48593347a0e3f34b251b178dc36f9471dfb05675
 SHA512:
-  metadata.gz: 05f8aeb73e4ae741e9bb791bd32ccb602b54c0600ab0e0e743b28d3bebe98aad998532425ea0aac87071f7cb4edc00eadf64d16dd06514300470bed65ca254ee
-  data.tar.gz: 1e97433ff0b40817b2eb9360be901018adb250019f4cd1ee89ff30e876506bbe0809aa1c5cdb43ccd377dc4e9aacd6ab1dfefac312481e90145f853ae9e5ba93
+  metadata.gz: 2e3a10a0b3b36f0a3ca530eab10e3fd052b25fc2e31a2d97e7223e2bc7d1e4ca6b1169177dc85e08aa2e0c27c546ab3c0044cba00aec65a62fd128cc9f52ee0c
+  data.tar.gz: 5e81feeb3d6d66c496f2e55422d4b8aeb4ca0840e21213eb49d4a7980c983379d5bd5ae9ec467a984e35cd5f67799158a34e8cef430aeaf8688ec7799887d88f

data/README.md

@@ -1,4 +1,4 @@
-# Loggie
+# Loggie [![CircleCI](https://circleci.com/gh/IanVaughan/loggie.svg?style=svg)](https://circleci.com/gh/IanVaughan/loggie) [![Gem Version](https://badge.fury.io/rb/loggie.svg)](https://badge.fury.io/rb/loggie)
 
 ## Installation
 
@@ -16,33 +16,9 @@ Or install it yourself as:
 
     $ gem install loggie
 
-## Usage
-
-```ruby
-Loggie.search(query: "foobar")
-  => {:timestamp=>Sun, 08 Jan 2017 01:00:58 +0000,
-  :message=>
-  { "remote_addr"=>"11.11.36.72",
-    "version"=>"HTTP/1.1",
-    "host"=>"host.com",
-    "x_forwared_for"=>"11.11.11.11",
-    ...
-
-```
-
-Or, use from the command line with:
-
-`loggie foobar`
-
-env is required for command line usage, and can be prefixed to the command, eg:
-
-`READ_TOKEN=abc LOG_FILES=x,y,z loggie foobar`
-
-Or the create a `.loggie` file in the current path.
-
 ## Configuring Loggie
 
-```
+```ruby
 Loggie.configure do |config|
   # from https://logentries.com/app/<app>#/user-account/apikey
   config.read_token = 'key'
@@ -66,6 +42,30 @@ Loggie.configure do |config|
 end
 ```
 
+## Usage
+
+```ruby
+Loggie.search(query: "foobar") { |progress| puts "#{progress}% there!" }
+  => {:timestamp=>Sun, 08 Jan 2017 01:00:58 +0000,
+  :message=>
+  { "remote_addr"=>"11.11.36.72",
+    "version"=>"HTTP/1.1",
+    "host"=>"host.com",
+    "x_forwared_for"=>"11.11.11.11",
+    ...
+
+```
+
+Or, use from the command line with:
+
+`loggie foobar`
+
+env is required for command line usage, and can be prefixed to the command, eg:
+
+`READ_TOKEN=abc LOG_FILES=x,y,z loggie foobar`
+
+Or the create a `.loggie` file somewhere in the current path.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/loggie.rb

@@ -13,7 +13,7 @@ require "loggie/logentries/retry"
 require "loggie/logentries/response"
 
 module Loggie
-  def self.search(query:, from: 1.week.ago, to: Time.zone.now)
-    Logentries::Search.new(query: query, from: from, to: to).call
+  def self.search(query:, from: 1.week.ago, to: Time.zone.now, &block)
+    Logentries::Search.new(query: query, from: from, to: to, block: block).call
   end
 end

data/lib/loggie/configuration.rb

@@ -20,7 +20,7 @@ module Loggie
 
     def initialize
       @max_retry = 50
-      @log_level = :info
+      @log_level = :fatal
       @sleep_before_retry_seconds = 0.5
       @default_fields_included = [
         "request_method", "path_info", "query_string", "agent", 

data/lib/loggie/logentries/retry.rb

@@ -10,10 +10,13 @@ module Loggie
       class RetryCountExceededError < RetryError; end
       class RetryResponseError < RetryError; end
 
-      def initialize
+      MIN_ACCEPTED_SUCCESS_STATUS_CODE = 203
+
+      def initialize(block: nil)
         @retry_count = 0
         @max_retry = Loggie.configuration.max_retry
         @sleep_before_retry_seconds = Loggie.configuration.sleep_before_retry_seconds
+        @user_block = block
       end
 
       def call(url, method, options, &block)
@@ -21,31 +24,32 @@ module Loggie
         response = block.call(url, method, options)
         logger.debug "#{self.class} retry:#{@retry_count}, response:#{response.body}"
 
-        if response.code.to_i > 203
+        if response.code.to_i > MIN_ACCEPTED_SUCCESS_STATUS_CODE
           raise RetryCountExceededError, "Failed request with:#{response.message}"
         end
 
         res = Response.new response
         return res.events if res.events?
-        logger.info "Logentries returned progress:#{res.progress}"
 
         @retry_count += 1
         if @retry_count > max_retry
           raise RetryCountExceededError, "Retry count of #{max_retry} reached"
         end
+        logger.debug "Logentries returned progress:#{res.progress}, retry_count:#{@retry_count}"
+        user_block.call(res.progress, @retry_count) if user_block
 
         sleep sleep_before_retry_seconds
 
         self.call(res.next_url, :get, nil, &block)
 
       rescue RetryError => e
-        logger.error e.message
-        nil
+        logger.info e.message
+        []
       end
 
       private
 
-      attr_reader :max_retry, :sleep_before_retry_seconds
+      attr_reader :max_retry, :sleep_before_retry_seconds, :user_block
     end
   end
 end

data/lib/loggie/logentries/search.rb

@@ -12,11 +12,11 @@ module Loggie
       # @param [DateTime] to: query to date
       # @param [Array] log_files: list of log id files to search. default ENV['LOG_FILES']
       #
-      def initialize(query: nil, from: nil, to: nil, log_files: nil)
+      def initialize(query: nil, from: nil, to: nil, log_files: nil, block: nil)
         @query, @from, @to = query, from, to
         @log_files = log_files || Loggie.configuration.log_files
         @extract = Extract.new
-        @request = Request.new(retry_mechanism: Retry.new)
+        @request = Request.new(retry_mechanism: Retry.new(block: block))
       end
 
       def call(query: nil, from: nil, to: nil, log_files: nil)

data/lib/loggie/version.rb

@@ -1,3 +1,3 @@
 module Loggie
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggie
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ian Vaughan
@@ -133,7 +133,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2.0
-before_install: gem install bundler -v 1.12.5