collector/worker_node: use appname of Logger

5 files changed, 6 insertions, 6 deletions

diff --git a/lib/collector/node_connection.rb b/lib/collector/node_connection.rb
index f3da06f..3bf4b10 100644
--- a/lib/collector/node_connection.rb
+++ b/lib/collector/node_connection.rb
@@ -115,7 +115,7 @@ module Collector
     end
 
     def log(level, message)
-      Rails.logger.__send__(level, "[Node:#{@connection_id}] #{message}")
+      Rails.logger.__send__(level, "Node(#{@connection_id})") { message }
     end
   end
 end
diff --git a/lib/collector/node_manager.rb b/lib/collector/node_manager.rb
index e008dfa..4c308af 100644
--- a/lib/collector/node_manager.rb
+++ b/lib/collector/node_manager.rb
@@ -46,12 +46,12 @@ module Collector
           if con
             self.active_connections[first_inactive_id] = con
             con.activated_time = Time.now
-            Rails.logger.warn("[NodeManager] Registered node ##{con.connection_id} as group ##{first_inactive_id}")
+            Rails.logger.warn("NodeManager") { "Registered node ##{con.connection_id} as group ##{first_inactive_id}" }
             Account.for_node(first_inactive_id).each do |a|
               con.register_account(a)
             end
           else
-            Rails.logger.warn("[NodeManager] Not enough nodes: (#{self.active_connections.count {|c| c }}/#{Settings.collector.nodes_count})")
+            Rails.logger.warn("NodeManager") { "Not enough nodes: (#{self.active_connections.count {|c| c }}/#{Settings.collector.nodes_count})" }
           end
         end
       end
diff --git a/worker_node/lib/worker_node/collector_connection.rb b/worker_node/lib/worker_node/collector_connection.rb
index dca9dfd..ac9cfcd 100644
--- a/worker_node/lib/worker_node/collector_connection.rb
+++ b/worker_node/lib/worker_node/collector_connection.rb
@@ -99,7 +99,7 @@ module WorkerNode
     end
 
     def log(level, message)
-      WorkerNode.logger.__send__(level, "[CollectorConnection] #{message}")
+      WorkerNode.logger.__send__(level, "CollectorConnection") { message }
     end
   end
 end
diff --git a/worker_node/lib/worker_node/unique_channel.rb b/worker_node/lib/worker_node/unique_channel.rb
index fbefbdd..e40126e 100644
--- a/worker_node/lib/worker_node/unique_channel.rb
+++ b/worker_node/lib/worker_node/unique_channel.rb
@@ -9,7 +9,7 @@ module WorkerNode
     def push(type, event)
       u = @block.call(event)
       if @cache.key?(u)
-        WorkerNode.logger.debug("[UniqueChannel] Duplicate event: #{u}")
+        WorkerNode.logger.debug("UniqueChannel") { "Duplicate event: #{u}" }
       else
         @channel.push [type, event]
         if u
diff --git a/worker_node/lib/worker_node/user_stream.rb b/worker_node/lib/worker_node/user_stream.rb
index 555388c..907f7c0 100644
--- a/worker_node/lib/worker_node/user_stream.rb
+++ b/worker_node/lib/worker_node/user_stream.rb
@@ -166,7 +166,7 @@ module WorkerNode
     end
 
     def log(level, message)
-      WorkerNode.logger.__send__(level, "[UserStream:##{@account_id}:#{@user_id}] #{message}")
+      WorkerNode.logger.__send__(level, "UserStream(##{@account_id}/#{@user_id})") { message }
     end
   end
 end