arya-mongrel_proctitle 1.3.0 → 1.3.1

data/lib/mongrel_proctitle.rb

@@ -12,8 +12,16 @@ module Mongrel
       @request_threads = []
       @queue_length = 0
       @request_count = 0
+      @updater_thread = Thread.new do
+        while true
+          @mutex.synchronize do
+            set_request_list_title
+          end
+          sleep 0.1
+        end
+      end
     end
-    
+
     # Returns port used in title.
     def port
       @port
@@ -57,13 +65,23 @@ module Mongrel
           @request_threads.unshift(@request_threads.delete(running_thread)) if running_thread
           # this isn't exact, but it works for most situations
         end
-        starting = @request_threads.first[:arrived_at]
+        now = Time.now.to_f
         list = @request_threads.inject([]) do |str, thread|
-          str << "#{thread[:arrived_at] - starting}s #{thread[:request_str]}"
+          str << "#{time_delta_abbriv(now - thread[:arrived_at])} #{thread[:request_str]}"
         end.join(" | ")
         self.title = "handling #{list}"
       end
     end
+    
+    def time_delta_abbriv(delta)
+      if delta < 60
+        "%.1fs" % delta
+      elsif delta < 3600
+        "#{delta.to_i / 60}m#{delta.to_i % 60}s"
+      else
+        "#{delta.to_i / 3600}h#{(delta.to_i % 3600) / 60}m"
+      end
+    end
 
     # Reports process as being idle.
     def set_idle
@@ -84,9 +102,11 @@ module Mongrel
       # path = "#{path[0, 60]}..." if path.length > 60
       # Thread.current[:request_str] = "#{address}: #{method} #{path}"
       Thread.current[:request_str] = "#{method} #{path}"
-      Thread.current[:arrived_at] = Time.now.to_i
-      @request_threads.push(Thread.current)
-      set_request_list_title(Thread.current)
+      Thread.current[:arrived_at] = Time.now.to_f
+      @mutex.synchronize do
+        @request_threads.push(Thread.current)
+        set_request_list_title(Thread.current)
+      end
     end
     
     # Returns current title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arya-mongrel_proctitle
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Arya Asemanfar