message 0.0.6 → 0.0.7

data/lib/message.rb

@@ -29,6 +29,10 @@ module Message
     end
   end
 
+  def log(level, &block)
+    Message.logger.send(level) { "[Thread-#{Thread.current.object_id}] #{block.call}" }
+  end
+
   def logger
     @logger ||= Logger.new(STDOUT)
   end

data/lib/message/filters/benchmarking.rb

@@ -7,11 +7,11 @@ module Message
           return filter.call(msg) unless action == :process
 
           ret = nil
-          Message.logger.info { "#{job.name}: processing one message"}
+          Message.log(:info) { "#{job.name}: processing one message"}
           s = Benchmark.realtime do
             ret = filter.call(msg)
           end
-          Message.logger.info { "#{job.name}: processed in #{(1000 * s).to_i}ms" }
+          Message.log(:info) { "#{job.name}: processed in #{(1000 * s).to_i}ms" }
           ret
         end
       end

data/lib/message/filters/error_handling.rb

@@ -9,7 +9,7 @@ module Message
             filter.call(msg)
           rescue => e
             job_name = job.name rescue 'unknown job(find job name failed)'
-            Message.logger.error {"#{action} #{job_name} message failed, #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"}
+            Message.log(:error) {"#{action} #{job_name} message failed, #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"}
             if self.callback
               self.callback.call(e, msg, job, action)
             end

data/lib/message/worker.rb

@@ -71,15 +71,16 @@ module Message
       delay = options[:delay] || 10 + rand(20)
       Thread.start do
         begin
-          log(:info) { "start" }
+          Message.log(:info) { "[Worker] start in #{delay}" }
           sleep delay
           loop do
             process(size)
             sleep interval
           end
-          log(:info) { "stopped" }
         rescue => e
-          log(:error) { "crashed: #{e.message}\n#{e.backtrace.join("\n")}"}
+          Message.log(:error) { "[Worker] crashed: #{e.message}\n#{e.backtrace.join("\n")}"}
+        ensure
+          Message.log(:info) { "[Worker] stopped" }
         end
       end
     end
@@ -112,9 +113,5 @@ module Message
       obj, m, args = work
       obj.send(m, *args)
     end
-
-    def log(level, &block)
-      Message.logger.send(level) { "[Worker(#{Thread.current.object_id})] #{block.call}" }
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: