r72737 - in /trunk/libgearman-client-perl/debian: changelog patches/fix-server-connection-error.patch patches/series

[wallmari-guest at users.alioth.debian.org]

Author: wallmari-guest
Date: Mon Apr 18 09:18:12 2011
New Revision: 72737

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72737
Log:
patch to fix Worker connection issue (Closes: #611355)

Added:
    trunk/libgearman-client-perl/debian/patches/fix-server-connection-error.patch
Modified:
    trunk/libgearman-client-perl/debian/changelog
    trunk/libgearman-client-perl/debian/patches/series

Modified: trunk/libgearman-client-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgearman-client-perl/debian/changelog?rev=72737&op=diff
==============================================================================
--- trunk/libgearman-client-perl/debian/changelog (original)
+++ trunk/libgearman-client-perl/debian/changelog Mon Apr 18 09:18:12 2011
@@ -1,8 +1,12 @@
 libgearman-client-perl (1.11-2) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/rules: switch order of arguments to dh.
 
- -- gregor herrmann <gregoa at debian.org>  Wed, 28 Jul 2010 14:32:36 -0400
+  [ Richard Wallman ]
+  * Fixed issue with Workers never connecting to servers (Closes: #611355)
+ 
+ -- Richard Wallman <wallmari at bossolutions.co.uk>  Thu, 14 Apr 2011 19:43:49 +0000
 
 libgearman-client-perl (1.11-1) unstable; urgency=low
 

Added: trunk/libgearman-client-perl/debian/patches/fix-server-connection-error.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgearman-client-perl/debian/patches/fix-server-connection-error.patch?rev=72737&op=file
==============================================================================
--- trunk/libgearman-client-perl/debian/patches/fix-server-connection-error.patch (added)
+++ trunk/libgearman-client-perl/debian/patches/fix-server-connection-error.patch Mon Apr 18 09:18:12 2011
@@ -1,0 +1,38 @@
+Description: fix issue with Worker.pm
+ patch to fix Worker connection issue (#611355)
+Author: Richard Wallman <wallmari at bossolutions.co.uk>
+Origin: vendor
+Forwarded: no
+--- a/lib/Gearman/Worker.pm
++++ b/lib/Gearman/Worker.pm
+@@ -263,6 +263,10 @@
+     # ( js => last_update_time, ... )
+     my %last_update_time;
+ 
++    my $on_connect = sub {
++        return Gearman::Util::send_req($_[0], \$presleep_req);
++    };
++
+     while (1) {
+         # "Jobby" job servers are the set of server which we will contact
+         # on this pass through the loop, because we need to clear and use
+@@ -278,7 +282,7 @@
+         for (my $i = 0; $i < $js_count; $i++) {
+             my $js_index = ($i + $js_offset) % $js_count;
+             my $js = $jobby_js[$js_index];
+-            my $jss = $self->_get_js_sock($js)
++            my $jss = $self->_get_js_sock($js, on_connect => $on_connect)
+                 or next;
+ 
+             # TODO: add an optional sleep in here for the test suite
+@@ -380,10 +384,6 @@
+ 
+         my @jss;
+ 
+-        my $on_connect = sub {
+-            return Gearman::Util::send_req($_[0], \$presleep_req);
+-        };
+-
+         foreach my $js (@{$self->{job_servers}}) {
+             my $jss = $self->_get_js_sock($js, on_connect => $on_connect)
+                 or next;

Modified: trunk/libgearman-client-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgearman-client-perl/debian/patches/series?rev=72737&op=diff
==============================================================================
--- trunk/libgearman-client-perl/debian/patches/series (original)
+++ trunk/libgearman-client-perl/debian/patches/series Mon Apr 18 09:18:12 2011
@@ -1,1 +1,2 @@
 fix-pod-errors.patch
+fix-server-connection-error.patch