ghost_reader 1.2.0 → 1.2.1

data/lib/ghost_reader/backend.rb

@@ -65,7 +65,7 @@ module GhostReader
         diff = Time.now - @report_ts
         if diff > config.report_interval
           threadify do
-            log "Kick off report. #{missings.inspect}", :info
+            log "Kick off report. #{missings.inspect}"
             @report_ts = Time.now
             report
             @report_ts = Time.now
@@ -102,18 +102,6 @@ module GhostReader
         memoized_lookup.send(options[:method], symbolized_flattend)
       end
 
-      # # performs initial and incremental requests
-      # def spawn_retriever
-      #   log "Spawning retriever."
-      #   @retriever = Thread.new do
-      #     initialize_retrieval
-      #     until false
-      #       sleep config.retrieval_interval
-      #       retrieve
-      #     end
-      #   end
-      # end
-
       def initialize_retrieval
         log "Performing initial request."
         response = config.client.initial_request
@@ -132,31 +120,20 @@ module GhostReader
           log "Data: #{response[:data].inspect}"
           memoize_merge! response[:data], :method => :deep_merge!
         else
-          log "Incremental request, but no data."
+          log "Incremental request, but no data.", :info
         end
       rescue => ex
         log "Exception in retrieval: #{ex}", :error
         log ex.backtrace.join("\n"), :error
       end
 
-      # # performs reporting requests
-      # def spawn_reporter
-      #   log "Spawning reporter."
-      #   @reporter = Thread.new do
-      #     until false
-      #       sleep config.report_interval
-      #       report
-      #     end
-      #   end
-      # end
-
       def report
         unless self.missings.nil?
           unless self.missings.empty?
             log "Reporting request with #{self.missings.keys.size} missings.", :info
             config.client.reporting_request(missings)
             self.missings.clear
-            log "Missings emptied.", :info
+            log "Missings emptied."
           else
             log "Reporting request omitted, nothing to report."
           end

data/lib/ghost_reader/client.rb

@@ -24,7 +24,7 @@ module GhostReader
     # returns true if redirected, false otherwise
     def reporting_request(data)
       response = connect_with_retry(:post, :body => "data=#{data.to_json}")
-      config.logger.error "Reporting request not redirected" unless response.status == 302
+      log("Reporting request not redirected", :error) unless response.status == 302
       { :status => response.status }
     end
 
@@ -41,7 +41,7 @@ module GhostReader
 
     # this is just a wrapper to have a log message when the field is set
     def last_modified=(value)
-      config.logger.debug "Last-Modified: #{value}"
+      log "Last-Modified: #{value}"
       @last_modified = value
     end
 
@@ -61,21 +61,21 @@ module GhostReader
       raise 'no api_key provided' if config.api_key.nil?
       @address ||= config.uri.
         sub(':protocol', config.protocol).
-        sub(':host', config.host).
-        sub(':api_key', config.api_key)
+        sub(':host',     config.host).
+        sub(':api_key',  config.api_key)
     end
 
     # Wrapper method for retrying the connection
     #   :method - http method (post and get supported at the moment)
     #   :params - parameters sent to the service (excon)
     def connect_with_retry(method = :get, params = {})
-      config.logger.debug "Request: #{method} #{params.inspect}"
+      log "Request: #{method} #{params.inspect}"
       retries = self.config.connection_retries
       while (retries > 0) do
         response = service.request(params.merge(:method => method))
 
         if response.status == 408
-          config.logger.error "Connection time-out. Retrying... #{retries}"
+          log "Connection time-out. Retrying... #{retries}", :error
           retries -= 1
         else
           retries = 0 # There is no timeout, no need to retry
@@ -93,5 +93,10 @@ module GhostReader
         :connection_retries => 3
       }
     end
+
+    def log(msg, level=:debug)
+      config.logger.send(level, "[#{$$}] #{msg}")
+    end
+
   end
 end

data/lib/ghost_reader/version.rb

@@ -1,3 +1,3 @@
 module GhostReader
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghost_reader
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Phil Hofmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 +01:00
+date: 2012-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency