keen 0.0.52 → 0.0.53

data/bin/keen_send

@@ -44,4 +44,8 @@ end
 
 storage_handler = Keen::Client.create_new_storage_handler(options[:storage_mode])
 worker = Keen::Async::Worker.new(storage_handler)
-puts worker.process_queue
+results = worker.process_queue
+
+
+puts results
+

data/lib/keen/async/job.rb

@@ -31,7 +31,7 @@ module Keen
 
         # define some key lists:
         required_keys = [:project_id, :auth_token, :collection_name, :event_body]
-        optional_keys = []
+        optional_keys = [:keen_client_version]
         all_keys = required_keys + optional_keys
 
 
@@ -54,6 +54,10 @@ module Keen
           self.instance_variable_set("@#{key}", value)
         end
 
+        unless definition.has_key? :keen_client_version
+          definition[:keen_client_version] = Keen::VERSION
+        end
+
         @definition = definition
 
 

data/lib/keen/async/storage/redis_handler.rb

@@ -12,7 +12,7 @@ module Keen
         # ----
 
         def global_key_prefix
-          "keen_415" + Keen::VERSION
+          "keen"
         end
         
         def active_queue_key
@@ -25,7 +25,9 @@ module Keen
 
         def add_to_active_queue(value)
           @redis.lpush active_queue_key, value
-          puts "added #{value} to active queue; length is now #{@redis.llen active_queue_key}"
+          if @logging
+            puts "added #{value} to active queue; length is now #{@redis.llen active_queue_key}"
+          end
         end
 
         def record_job(job)
@@ -36,8 +38,9 @@ module Keen
           # TODO consume the failed_queue and do something with it (loggly? retry? flat file?)
         end
 
-        def initialize
+        def initialize(logging = false)
           @redis = Redis.new
+          @logging = logging
         end
         
         def redis=(connection)
@@ -105,9 +108,15 @@ module Keen
 
           jobs = []
 
+          #puts "doing the job #{how_many} times"
+
           how_many.times do
             this = @redis.lpop key
-            jobs.push JSON.parse this
+            if this
+              jobs.push JSON.parse this
+            else
+              #puts "couldn't process value #{this}"
+            end
           end
 
           collate_jobs(jobs)

data/lib/keen/async/worker.rb

@@ -40,7 +40,7 @@ module Keen
           end
         end
 
-        puts "Worker sent #{num_batches} batches of #{batch_size} events per batch."
+        return "Worker sent #{num_batches} batches of #{batch_size} events per batch."
       end
       
       def send_batch(project_id, batch)

data/lib/keen/version.rb

@@ -1,3 +1,3 @@
 module Keen
-  VERSION = "0.0.52"
+  VERSION = "0.0.53"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keen
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: 
   segments: 
   - 0
   - 0
-  - 52
-  version: 0.0.52
+  - 53
+  version: 0.0.53
 platform: ruby
 authors: 
 - Kyle Wild