simple_events_redis 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzRlMWU0MjUxNGIxYmFiZTBiN2YzMDYyZjdkN2Q1NTA3ZDdhYzFlOQ==
+    NDU1ZWIzMzRjYjRkM2IzZTQ1ODc2YTE5MjE0OTI3MzYwY2YzMTViNQ==
   data.tar.gz: !binary |-
-    NzFlOGMwOWVhNWZkMDdmNWFkNDA1MDJhOTYxMjAxYWI5MDViZGM1ZA==
+    ODZlY2JmMGUxN2ExYWQ2OWM5YWExYTg5Y2ZiODkyODg1OTk5MWU4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzQ0ZjgyZGE0NGVhZWQwYjgxZjBjMmFiOThlYTFiZjZjZTVlZWFlZGRjOGRi
-    MzdjMzUwOGRkYTI5NzZiMTVjMTNmMjIyMTkwZjE5ZWRlNDk2ODVmN2IzYjM4
-    ZDZhYjI2NmE0MTczYjBiOWM5YTRkMDZlNWJiZmM5NjA0MGRlYzA=
+    M2E1OTI3ZTE2ZmNhOTNlM2E0YmNmYzc3OWNlYzc3NGI3ODM0NjUxZWM2YWIw
+    ZTBiZWM2MTA1ZDVmZTVmZDYzZTc4ZjZjMmI1MTgwYjU0NjkyNTk5MDE5NzA1
+    NzVjOGY3ODFjNWFkMWNkMmUwN2IwMjI0MTA5ZWNhOTlkZDU2NzQ=
   data.tar.gz: !binary |-
-    YjdjOTBhNWRmMDNlZTQ0OTViMGNlOTQzMDViMzZkZDU5ODk4ODVkNmYyMzkx
-    ZjU0ODNiNDU1N2E5MDA0ODk4NGM3OWYyODliNWExYzM2M2VlMTVmMDk2NmNi
-    ZTA1MTdjNTI2NmMzOGNiNjNhYmJkYWI5MTk2MmRlODVhNzRhMTA=
+    OTY3NzEyMjQ3ZjJkNTUxNTk0MjAwNGY3N2Y5ODg2ZTlkYjQ4MTNhMmZiNWNj
+    ZTYzYzVhMTRmNGM5MzJmZDNjZTU4OTQ1OGY0OWJjYjdhNDQxYmYxNDYyM2Jl
+    ZTk2YjAyMGE4N2RkOTk4YjYzNjViOWVlNDg3MTAyMWIyODEwYzU=

data/lib/events.rb

@@ -4,14 +4,32 @@
 
   class Events
     # static data
-    #PROCESSES = ['effects']
-    SITE_NAME = ''
 
-    EXPIRE_DAYS = 7
+    @@SITE_NAME = '' # default site
+
+    # config
+    @@config = {:EXPIRE_DAYS=>7}
+
 
 
     @@redis = nil
 
+    def self.this_site_name
+      return @@SITE_NAME
+    end
+
+    def self.this_site_name=(v)
+      @@SITE_NAME = v
+    end
+
+    def self.config(iv)
+      return @@config[iv]
+    end
+
+    def self.set_config(hash)
+      hash.each_pair { |k,v| @@config[k] = v }
+    end
+
     # redis object to access Redis server
     def self.redis
       return @@redis unless @redis.nil?
@@ -60,7 +78,7 @@
       s = JSON.generate(hash)
 
       redis.rpush rkey, s
-      redis.expireat rkey, t+EXPIRE_DAYS*24*60*60
+      redis.expireat rkey, t+self.config(:EXPIRE_DAYS)*24*60*60
 
       return true
     end
@@ -80,9 +98,8 @@
     end
 
 
-
-    def self.get_logs(log_name, n_days_back=-1, filter={})
-      all_keys = redis.keys(self.redis_key_log_prefix + "#{log_name}:" +'*')
+    def self.get_logs_of_site(site_name, log_name, n_days_back=-1, filter={})
+      all_keys = redis.keys(self.redis_key_log_prefix(site_name) + "#{log_name}:" +'*')
 
       return [] if all_keys.nil?
 
@@ -136,6 +153,9 @@
     end
 
 
+    def self.get_logs(log_name, n_days_back=-1, filter={})
+      return get_logs_of_site(self.this_site_name, log_name, n_days_back, filter)
+    end
 
 
 
@@ -146,26 +166,35 @@
       return true
     end
 
-    def self.get_status(event_name, v_def=nil)
-      v = redis.hget self.redis_key_status, event_name
+    def self.get_status_of_site(site_name, event_name, v_def=nil)
+      v = redis.hget self.redis_key_status(site_name), event_name
       v ||= v_def
       v
     end
 
-    def self.get_statuses(pattern='*')
+    def self.get_status(event_name, v_def=nil)
+      return get_status_of_site(self.this_site_name, event_name, v_def)
+    end
+
+
+    def self.get_statuses_of_site(site_name, pattern='*')
       # event_names like 'name*'
 
       rows = []
 
-      all_values = redis.hgetall self.redis_key_status
+      all_values = redis.hgetall self.redis_key_status(site_name)
 
       all_values.each do |event, v|
-        rows << {:site=>SITE_NAME, :event=>event, :v=>v}
+        rows << {:site=>site_name, :event=>event, :v=>v, }
       end
 
       rows
     end
 
+    def self.get_statuses(pattern='*')
+      return get_statuses_of_site(self.this_site_name, pattern)
+    end
+
 
 
     # counters
@@ -176,22 +205,43 @@
       return true
     end
 
-    def self.stat_add_perf(event_name, duration_secs, n=1)
-      redis.hincrby self.redis_key_stat, event_name+'_time', (duration_secs*1000).floor
+    def self.stat_add_perf(event_name, duration, n=1)
+      redis.hincrby self.redis_key_stat, event_name+'_time', duration
       redis.hincrby self.redis_key_stat, event_name+'_n', 1
 
-      return 1
+      return true
     end
 
+    def self.stat_perf_measure(event_name)
+      s = Time.now
+      yield
+      e = Time.now
 
-    def self.get_stats(n_days_back=1)
+      duration = e - s
+
+      self.stat_add_perf event_name, duration
+    end
+
+
+    def self.get_stat_of_site(site_name, event_name, v_def=0)
+      v = redis.hget self.redis_key_stat(site_name), event_name
+      v ||= v_def
+      v
+    end
+
+    def self.get_stat(event_name, v_def=0)
+      return get_stat_of_site(self.this_site_name, event_name, v_def)
+    end
+
+
+    def self.get_stats_of_site(site_name, n_days_back=1)
       rows = []
 
-      self.stat_walk(n_days_back, 0) do |key, day|
+      self.stat_walk(site_name, n_days_back, 0) do |key, day|
         all_values = redis.hgetall key
 
         all_values.each do |event, v|
-          rows << {:site=>SITE_NAME, :created=>day.to_i, :event=>event, :amount=>v.to_i}
+          rows << {:site=>site_name, :created=>day.to_i, :date=>Time.at(day.to_i), :event=>event, :amount=>v.to_i}
         end
       end
 
@@ -199,46 +249,86 @@
     end
 
 
+    def self.get_stats(n_days_back=1)
+      return get_stats_of_site(self.this_site_name, n_days_back)
+    end
 
+    def self.stat_walk(site_name, n_days_back_from, n_days_back_to)
+      tnow = Time.now.utc.to_i
 
-    # helper methods
+      key_prefix = self.redis_key_stat_prefix(site_name)
+      keys = redis.keys key_prefix + "*"
+
+      keys.each do |key|
+        # parse key
+        mm = key.scan(/#{key_prefix}(\d+)$/i)
+
+        next if mm.nil? || mm[0].nil?
+
+        day = self.parse_date(mm[0][0])
 
-    def self.redis_key_prefix
-      "#{SITE_NAME=='' ? '' : SITE_NAME+':'}"
+        next if day.nil?
+
+        # too old
+        if n_days_back_from>=0
+          next if tnow - day.to_i > n_days_back_from * (60*60*24)
+        end
+
+        # too fresh
+        if n_days_back_to>=0
+          next if tnow - day.to_i < n_days_back_to * (60*60*24)
+        end
+
+        # do the work
+        yield(key, day)
+
+      end
     end
 
+
+
+
+
+    # helper methods
+
     def self.key_day(d=nil)
       d ||= DateTime.now.new_offset(0)
 
       d.strftime("%Y%m%d")
     end
 
+    def self.redis_key_prefix(site_name=nil)
+      site_name ||= self.this_site_name
+
+      "#{site_name=='' ? '' : site_name+':'}"
+    end
+
 
     # redis keys for log
-    def self.redis_key_log_prefix
-      self.redis_key_prefix + "log:"
+    def self.redis_key_log_prefix(site_name=nil)
+      self.redis_key_prefix(site_name) + "log:"
     end
 
-    def self.redis_key_log(name)
-      self.redis_key_log_prefix + "#{name}:" + self.key_day
+    def self.redis_key_log(name, site_name=nil)
+      self.redis_key_log_prefix(site_name) + "#{name}:" + self.key_day
     end
 
 
     # redis keys for status
 
-    def self.redis_key_status
-      self.redis_key_prefix + 'status'
+    def self.redis_key_status(site_name=nil)
+      self.redis_key_prefix(site_name) + 'status'
     end
 
 
     # redis keys for stat
 
-    def self.redis_key_stat_prefix
-      self.redis_key_prefix + 'stat:'
+    def self.redis_key_stat_prefix(site_name=nil)
+      self.redis_key_prefix(site_name) + 'stat:'
     end
 
-    def self.redis_key_stat
-      self.redis_key_stat_prefix + self.key_day
+    def self.redis_key_stat(site_name=nil)
+      self.redis_key_stat_prefix(site_name) + self.key_day
     end
 
 
@@ -308,38 +398,6 @@
     end
 
 
-    def self.stat_walk(n_days_back_from, n_days_back_to)
-
-      tnow = Time.now.utc_to_i
-
-      key_prefix = self.redis_key_stat_prefix
-      keys = redis.keys key_prefix + "*"
-
-      keys.each do |key|
-        # parse key
-        mm = key.scan(/#{key_prefix}:(\d+)$/i)
-
-        next if mm.nil? || mm[0].nil?
-
-        day = self.parse_date(mm[0][0])
-
-        next if day.nil?
-
-        # too old
-        if n_days_back_from>=0
-          next if tnow - day.to_i > n_days_back_from * (60*60*24)
-        end
-
-        # too fresh
-        if n_days_back_to>=0
-          next if tnow - day.to_i < n_days_back_to * (60*60*24)
-        end
-
-        # do the work
-        yield(key, day)
-
-      end
-    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_events_redis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ! 'Max Ivak '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: