Merge pull request #6 from jjb/spool-down-threads-when-exiting

Spool down threads when exiting

Author: jjb

lib/stathat.rb

@@ -75,7 +75,6 @@ class Reporter
 
     def initialize
       @que = Queue.new
-      @runlock = Mutex.new
       run_pool
     end
 
@@ -111,12 +110,10 @@ def ez_post_count(stat_name, ezkey, count, timestamp, cb)
   private
 
     def run_pool
-      @runlock.synchronize { @running = true }
       @pool = []
       5.times do |i|
         @pool[i] = Thread.new do
-          while true do
-            point = @que.pop
+          while point = @que.pop do
             # XXX check for error?
             begin
               resp = Common::send_to_stathat(point[:url], point[:args])
@@ -126,23 +123,21 @@ def run_pool
             rescue
               pp $!
             end
-            @runlock.synchronize do
-              break unless @running
-            end
           end
         end
       end
     end
 
     def stop_pool
-      @runlock.synchronize { @running = false }
+      @que.close
+
       @pool.each do |th|
-        th.join if th && th.alive?
+        th.join(5)
       end
     end
 
     def enqueue(url, args, cb=nil)
-      return false unless @running
+      return false if @que.closed?
       point = { url: url, args: args, cb: cb }
       @que << point
       true
@@ -182,3 +177,11 @@ def parse
     end
   end
 end
+
+%w[INT TERM].each do |signal|
+  old_handler = trap(signal) do
+    puts "StatHat::Reporter.instance.finish in response to #{signal}"; STDOUT.flush
+    StatHat::Reporter.instance.finish
+    old_handler.call if old_handler.respond_to?(:call)
+  end
+end