gearman-ruby 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2549af4db82515db032fd209b69d14581d0f4874
-  data.tar.gz: d53770255855d94b70ff47554e2bc1ffd08e6b6b
+  metadata.gz: f8799efeb8ec1766ffb262f401595cf9f1029fdc
+  data.tar.gz: e672b3358f6bda8dc55467e1a5af72973d422e2d
 SHA512:
-  metadata.gz: 3965b0ea6f6706ccfca686b68e56bdc18f7e2704778e53a165600296c05a9fa88e8b73522f8ab454a8bee5b47c8670c5329d726721be0b71782247dfd87934eb
-  data.tar.gz: 6d2466dff2c3dd6ff723c87b10a724b95d7453730900842b2fee16f5125b55c9c61fc368233b313b945de580fd85aeac7f9f24d90dfe034c27484a7db13ae33a
+  metadata.gz: efea3f3ae2c88664d13b56debf6ec69e533c43136c8b2555f6c93de7ade16406e51ccee0fd27d3a40cecb07f347281f92139b8b30a2cc6a12c1f9ac49c1d36a8
+  data.tar.gz: 5e391604849cec1c2ae53b300d9c0812b2a9f55b9a76faa0f9843b48cc4368a82f44adc0d545ad9adbdbae54552ae6115089365361a725c1180f985193a0b66a

data/examples/client.rb

@@ -1,14 +1,21 @@
 $LOAD_PATH.unshift("../lib")
 require 'rubygems'
-require '../lib/gearman'
+require 'gearman'
 
-servers = ['localhost:4730', 'localhost:4731']
+# Control logger
+l = Logger.new($stdout)
+l.level = Logger::DEBUG
+Gearman.logger=l
+
+servers = ['localhost:4730']
   
 client = Gearman::Client.new(servers)
 taskset = Gearman::TaskSet.new(client)
 
 task = Gearman::Task.new('sleep', 20)
-task.on_complete {|d| puts d }
+task.on_status {|n,d| puts "Status: #{n}/#{d} iterations complete" }
 
+# Add task to taskset
 taskset.add_task(task)
-taskset.wait(100)
+# Submit taskset and wait forever for completion
+taskset.wait_forever

data/examples/client_background_jobs.rb

@@ -0,0 +1,22 @@
+$:.push('../lib')
+require 'gearman'
+require 'logger'
+
+logger = Logger.new(STDOUT)
+logger.level = Logger::ERROR
+Gearman.logger = logger
+
+JOB_COUNT=100000
+
+client = Gearman::Client.new('localhost:4730')
+
+start_time = Time.now
+(1..JOB_COUNT).each do |jid|
+  data = rand(36**8).to_s(36)
+  task = Gearman::BackgroundTask.new("reverse_string", data)
+  client.do_task(task)
+end
+end_time = Time.now
+
+diff = end_time - start_time
+puts "Completed #{JOB_COUNT} jobs in #{diff} seconds, at #{JOB_COUNT.to_f / diff} JPS"

data/examples/client_reverse_string.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+$:.unshift '../lib'
+require 'gearman'
+
+client = Gearman::Client.new('localhost:4730')
+
+# Create 100 foreground jobs, one at a time
+(1..100).each do |jid|
+  data = rand(36**8).to_s(36)
+  puts "#{jid} #{data}"
+  task = Gearman::Task.new('reverse_string', data)
+  task.on_complete {|d| puts d }
+  client.do_task(task)
+end
+
+

data/examples/worker.rb

@@ -10,7 +10,7 @@ logger = Logger.new(STDOUT)
 # Add a handler for a "sleep" function that takes a single argument, the
 # number of seconds to sleep before reporting success.
 w.add_ability("sleep") do |data,job|
- seconds = 10
+ seconds = data.to_i
  logger.info "Sleeping for #{seconds} seconds"
  (1..seconds.to_i).each do |i|
    sleep 1

data/examples/worker_reverse_string.rb

@@ -1,11 +1,8 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', "lib" )
+$:.unshift '../lib'
 require 'gearman'
 
 # String reverse worker 
-
 servers = ['127.0.0.1:4730']
-
-t = nil
 jobnum = 0
 
 w = Gearman::Worker.new(servers)

data/lib/gearman/client.rb

@@ -88,7 +88,7 @@ module Gearman
                           end
               type, data = connection.read_response(remaining)
               handle_response(task, type, data)
-            end while [:work_status, :work_data].include? type
+            end while [:work_status, :work_data, :work_warning].include? type
           end
 
         else
@@ -129,11 +129,11 @@ module Gearman
           task.handle_status(numerator, denominator)
         when :work_warning
           handle, message = data.split("\0", 2)
-          Util.logger.debug "Got WORK_WARNING for #{handle}: '#{message}'"
+          logger.warn "Got WORK_WARNING for #{handle}: '#{message}'"
           task.handle_warning(message)
         when :work_data
           handle, work_data = data.split("\0", 2)
-          Util.logger.debug "Got WORK_DATA for #{handle} with #{work_data ? work_data.size : '0'} byte(s) of data"
+          logger.debug "Got WORK_DATA for #{handle} with #{work_data ? work_data.size : '0'} byte(s) of data"
           task.handle_data(work_data)
         else
           # Not good.

data/lib/gearman/version.rb

@@ -1,3 +1,3 @@
 module Gearman
-  VERSION = "4.0.3"
+  VERSION = '4.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gearman-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - John Ewart
@@ -26,8 +26,8 @@ files:
 - README.md
 - Rakefile
 - examples/client.rb
-- examples/client_reverse_nohost.rb
-- examples/client_reverse_wait.rb
+- examples/client_background_jobs.rb
+- examples/client_reverse_string.rb
 - examples/worker.rb
 - examples/worker_reverse_string.rb
 - gearman-ruby.gemspec

data/examples/client_reverse_nohost.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require '../lib/gearman'
-l = Logger.new($stdout)
-l.level = Logger::DEBUG
-Gearman::Util.logger=l
-
-# Client using Gearman SUBMIT_JOB_EPOCH (currently requires the gearmand branch lp:~jewart/gearmand/scheduled_jobs_support/)
-
-t = nil
-threadcounter = 0
-
-client = Gearman::Client.new('192.168.1.1:4730')
-
-  
-myid = threadcounter 
-threadcounter += 1
-taskset = Gearman::TaskSet.new(client)
-  
-(1..1000).each do |jid|
-  data = rand(36**8).to_s(36)
-  result = data.reverse
-
-  task = Gearman::BackgroundTask.new("reverse_string", data)
-  puts "#{jid} #{data}"
-        
-  #time = Time.now() + rand(120) + 10
-  #task.schedule(time)
-  taskset.add_task(task)
-end

data/examples/client_reverse_wait.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), '..', "lib" )
-require 'gearman'
-
-# Client using Gearman SUBMIT_JOB_EPOCH (currently requires the gearmand branch lp:~jewart/gearmand/scheduled_jobs_support/)
-
-t = nil
-threadcounter = 0
-
-client = Gearman::Client.new('localhost:4730')
-
-  
-myid = threadcounter 
-threadcounter += 1
-taskset = Gearman::TaskSet.new(client)
-  
-(1..100).each do |jid|
-  data = rand(36**8).to_s(36)
-  puts "#{jid} #{data}"
-  task = Gearman::Task.new("reverse_string", data)
-  task.on_complete {|d| puts d }
-  client.do_task(task)
-end
-
-