balsamique 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa87508db8374e4941511cf4aea2322d1fdd7819
-  data.tar.gz: 5258fc17aa56b385a2643c27572f4ddad5e35e32
+  metadata.gz: 875fa74f76e93f583746ce80088297a1d0ee34ac
+  data.tar.gz: 0554405360376134aff714697848c98cb911b959
 SHA512:
-  metadata.gz: c0f08994466deb01389d682aefa71ee7130f392fba1bab0a3020248aac69563cb4ececf832f9e45131fa397973b26b7a3e99fa13d7644741f390533f6adc858e
-  data.tar.gz: fb3bddda2ecb9449d9ae6f7d5ff6acaedd70ce28b3275af14f0ce748f5083c844a52672c3eb8fa1f0695e75a54a20c10db99a609349d92969a75d8f37e6f74e6
+  metadata.gz: 173858d448408ba15351c0bcb908b615a403de5bdacc694e3caa3ff4708213dc6d4e84a23776585f755e8bb2e5036d8691903237d361e92b36a01885e07b6f09
+  data.tar.gz: be3fe7aff6d2fd2589abfc3173b8fe57c94dbda2e7a658a3730d6c84771c16a08d88ba9b4ed9612db3cd0fcf0c1751ae119a8e7e39a08d6cf2a425b0ac29e2b2

data/lib/balsamique.rb

@@ -52,8 +52,8 @@ class Balsamique
     end
   end
 
-  STATS_SLICE = 10 # seconds
-  STATS_CHUNK = 90 # slices (= 900 seconds = 15 minutes)
+  STATS_SLICE = 60 # seconds
+  STATS_CHUNK = 60 # slices (= 3600 seconds = 1 hr)
   def self.slice_timestamp(ts)
     slice = ts.to_i / STATS_SLICE
     return slice / STATS_CHUNK, slice % STATS_CHUNK
@@ -142,7 +142,7 @@ while KEYS[i] do
     redis.call('hset', KEYS[3], KEYS[i] .. ',len,' .. ARGV[3],
       redis.call('zcard', KEYS[i]))
     redis.call('hincrby', KEYS[3], KEYS[i] .. ',dq,' .. ARGV[3], 1)
-    redis.call('expire', KEYS[3], 21600)
+    redis.call('expire', KEYS[3], 90000)
     return({ elem[1],
       redis.call('hget', KEYS[1], elem[1]),
       redis.call('hget', KEYS[2], elem[1]), retries })
@@ -304,6 +304,38 @@ EOF
     result.keys.map { |k| self.class.strip_prefix(k, @que_prefix) }
   end
 
+  def queues_info
+    qs_info = redis.hgetall(@queues)
+    return {} if qs_info.empty?
+    now = Time.now.to_f
+    details = redis.multi do |r|
+      qs_info.keys.each do |key|
+        r.zrange(key, 0, 0, withscores: true)
+        r.zcount(key, 0, now)
+        r.zcard(key)
+      end
+    end
+    result = {}
+    qs_info.keys.each_with_index do |key, i|
+      i3 = 3 * i
+      queue = self.class.strip_prefix(key, @que_prefix)
+      last_id, last_ts = qs_info[key].split(',')
+      last_ts = last_ts.to_f
+      next_id = next_ts = nil
+      if (next_info = details[i3].first)
+        next_id = next_info.first
+        next_ts = next_info.last
+      end
+      result[queue] = {
+        current_ts: now,
+        last_id: last_id, last_ts: last_ts,
+        total: details[i3 + 2], ready: details[i3 + 1],
+        next_id: next_id, next_ts: next_ts
+      }
+    end
+    result
+  end
+
   def queue_length(queue)
     redis.zcard(@que_prefix + queue) || 0
   end
@@ -320,7 +352,7 @@ EOF
   end
 
   def remove_job(id)
-    status = redis.hget(@status, id)
+    return unless (status = redis.hget(@status, id))
     queue, timestamps = decode_job_status(status)
     redis.multi do |r|
       if queue.start_with?(@que_prefix)
@@ -339,8 +371,7 @@ EOF
       r.hdel(@args, id)
       r.hdel(@tasks, id)
     end
-    check_status = redis.hget(@status, id)
-    return if check_status.nil?
+    return unless (check_status = redis.hget(@status, id))
     if check_status == status
       redis.hdel(@status, id)
       if (uid = redis.hget(@unique, id))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balsamique
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - DWNLD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis