tiny_work_service 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296647c2c51d68cbba82065611381d054cd8cd03040ae517091c61d293cf2482
-  data.tar.gz: ab47c3e2df96388dd5d3addc3149a65a2b8fe2a9b9511e4e4212bde0c37b9a04
+  metadata.gz: 64ea8638eba6ebc22945d5c80631513c30d8866519b973e04d66a6a247e408c0
+  data.tar.gz: '099b5c7719d958f0674f1449d8da62d9de10fe66720b28aa0078c78f0c72bbf0'
 SHA512:
-  metadata.gz: 333a4611d4cdaf81840ace4effe638e47e298fb55cea680665f31e71d28f4d68282877714dd335fd612417055ba70b3bd03771ebdfb4e03984eada8f0f00c989
-  data.tar.gz: 3272a5cc96178eb56cd7f84f337a26bc859a62943996a0f4ec6b3158a10aa0c0915ff2f0404004ee96056886fb8e0d04eec3543de5c9b4fc60b9009669f50e17
+  metadata.gz: a68228cd855eeeb8943a20b87a12cb0b62f1bb6b9737251376a388eff7e08e5fa783fd2d0f5150eebb8d5c7237349d8abfe82568d59664c0a7140030b86cce15
+  data.tar.gz: b0a7f962ccac5be3a45c0869bae4432336547a411669b8cf3950751d31a67ac841c47adf13e86def1b046686b188f108e4cb79c3a9c8f7296d5dd8aeeb05bab0

data/lib/tiny_work_service.rb

@@ -4,20 +4,66 @@ require 'tiny_tcp_service'
 #  s = TinyWorkService.new(1234)
 #  s.stop!
 class TinyWorkService
+  attr_reader :jobs_enqueued,
+              :jobs_dequeued,
+              :jobs_per_minute,
+              :jobs_per_hour
+
   def initialize(port, label='TinyWorkService')
     @service = TinyTCPService.new(port)
     @service.msg_handler = self
     @jobs = Queue.new
     @label = label
 
-    @thread = Thread.new do
+    @jobs_enqueued = 0
+    @jobs_dequeued = 0
+    @jobs_to_track = Queue.new
+    @jobs_dequeued_tracker = []
+
+    @jobs_per_minute = 0.0
+    @jobs_per_hour = 0.0
+
+    # status printing thread
+    Thread.new do
       loop do
         break unless @service.running?
 
-        print "\r#{@label} #{@jobs.length.to_s.rjust(6)} jobs #{@service.num_clients.to_s.rjust(4)} workers\e[K"
+        print "\r#{@label}:#{port} jobs:#{@jobs.length.to_s} workers:#{@service.num_clients.to_s} jobs/m:#{@jobs_per_minute} jobs/h:#{@jobs_per_hour}\e[K"
         sleep 0.5
       end
     end
+
+    # update stats thread
+    Thread.new do
+      loop do
+        one_minute_ago = Time.now.to_i - 60
+        one_hour_ago = Time.now.to_i - 3600
+
+        # move jobs_to_track into jobs_dequeued_tracker, threadsafe
+        loop do
+          break if @jobs_to_track.length == 0
+          @jobs_dequeued_tracker << @jobs_to_track.shift
+        end
+
+        # remove job tracking times from older than one_hour_ago
+        loop do
+          break if @jobs_dequeued_tracker.empty? || @jobs_dequeued_tracker.first >= one_hour_ago
+          @jobs_dequeued_tracker.shift
+        end
+
+        counter = 0
+        i = -1
+        loop do
+          break if i.abs > @jobs_dequeued_tracker.length || @jobs_dequeued_tracker[i] < one_minute_ago
+          i -= 1
+          counter += 1
+        end
+        @jobs_per_minute = counter
+        @jobs_per_hour = @jobs_dequeued_tracker.count
+
+        sleep 2
+      end
+    end
   end
 
   # interface for TinyTCPService
@@ -37,18 +83,24 @@ class TinyWorkService
 
   # join the service Thread, if you want to wait until it's done
   def join
-    @thread.join
+    @service.join
   end
 
   # enqueue a job
   def <<(j)
+    @jobs_enqueued += 1
     @jobs << j
+
+    nil
   end
 
   # return the first job in the work queue, if there is one present
   # otherwise, return nil
   def shift
     return nil if @jobs.empty?
+    @jobs_dequeued += 1
+    @jobs_to_track << Time.now.to_i
+
     @jobs.shift
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_work_service
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeff Lunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tcp_service
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-description: uses the tiny_tcp_service gem to implement a job queue
+        version: '1.4'
+description: uses the tiny_tcp_service gem to implement a network job queue
 email: jefflunt@gmail.com
 executables: []
 extensions: []
@@ -53,5 +53,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: uses the tiny_tcp_service gem to implement a job queue
+summary: uses the tiny_tcp_service gem to implement a network job queue
 test_files: []