Add user-context to logged events

rwdaigle · May 24, 2012 · 76083c2 · 76083c2
1 parent 7ae5acf
commit 76083c2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/app/loaders/inbound_email_loader.rb b/app/loaders/inbound_email_loader.rb
@@ -3,8 +3,10 @@ class InboundEmailLoader
   class << self
 
     def load!(from, text)
-      log({action: "email-import", from: from, text: text}) do
+      log_context({user: 'ryan', user_id: 1}) do
-        Subject.add_vocabulary_word(text)
+        log({action: "email-import", from: from, text: text}) do
+          Subject.add_vocabulary_word(text)
+        end
       end
     end
   end

diff --git a/app/loaders/wordnik_wod_loader.rb b/app/loaders/wordnik_wod_loader.rb
@@ -5,10 +5,12 @@ class WordnikWODLoader
   class << self
 
     def load!(from = Date.today)
-      today = Date.today
+      log_context({user: 'ryan', user_id: 1}) do
-      while(from <= today)
+        today = Date.today
-        load_wod(from)
+        while(from <= today)
-        from = from + 1.day
+          load_wod(from)
+          from = from + 1.day
+        end
       end
     end
 

diff --git a/lib/event_logging.rb b/lib/event_logging.rb
@@ -6,11 +6,20 @@ module EventLogger
 
   module ClassMethods
 
+    def log_context(*segments, &block)
+      Scrolls.context(log_data_from(*segments), &block)
+    end
+
     def log(*segments, &block)
-      call_log_data = segments.inject({}) do |map, segment|
+      Scrolls.log(log_data_from(*segments), &block)
+    end
+
+    private
+
+    def log_data_from(*segments)
+      segments.inject({}) do |map, segment|
         map.merge!(segment.to_log)
       end
-      Scrolls.log(call_log_data, &block)
     end
 
   end