[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-292-g243ff62

[Scott Seago]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  243ff629e0d1009a6d7630b84728e232a0c666df (commit)
       via  419d9e9d0811452401a521f6730bfbf1802ca2f2 (commit)
      from  e757f8379e36af31dc053cbfc60c79380b3de2d6 (commit)

- Log -----------------------------------------------------------------
commit 243ff629e0d1009a6d7630b84728e232a0c666df
Author: Scott Seago <sseago at redhat.com>
Date:   Wed Sep 5 14:37:43 2007 -0400

    when qpid connection gets closed (interrupted on server side, etc.) reconnect to qpidd

commit 419d9e9d0811452401a521f6730bfbf1802ca2f2
Author: Scott Seago <sseago at redhat.com>
Date:   Wed Sep 5 14:36:58 2007 -0400

    updated spec version -- fix dependencies as we no longer require Ruby 1.8.6
-----------------------------------------------------------------------

Diffstat:
 common/busrpc/busrpc/qpid_transport.py |   16 ++++++++++++++++
 contrib/rubygem-mongrel.spec           |    7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/busrpc/busrpc/qpid_transport.py b/common/busrpc/busrpc/qpid_transport.py
index 6033e1e..2e9597a 100644
--- a/common/busrpc/busrpc/qpid_transport.py
+++ b/common/busrpc/busrpc/qpid_transport.py
@@ -176,6 +176,22 @@ class QpidServerTransport(QpidTransport, ServerTransport):
 
     def _poll(self):
         while not self.is_stopped:
+            if (self.connected):
+                is_closed = self.channel(1).closed
+                if (is_closed):
+                    #print "reopening.."
+                    try:
+                        del self.channels[1]
+                    except KeyError:
+                        pass
+                    self.connected = False
+            if (not self.connected):
+                try:
+                    self.connect()
+                except Exception, e:
+                    #try to connect again next iteration
+                    #print "trying again later ",e
+                    pass
             try:
                 msg = self.incoming_queue.get(timeout=15)
                 qpid_util.ack_message(self, message=msg)                
diff --git a/contrib/rubygem-mongrel.spec b/contrib/rubygem-mongrel.spec
index adf1893..e6043dd 100644
--- a/contrib/rubygem-mongrel.spec
+++ b/contrib/rubygem-mongrel.spec
@@ -8,7 +8,7 @@ Summary: A small fast HTTP library and server for Ruby apps
 Name: rubygem-%{gemname}
 
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Libraries
 # The entire source code is (GPLv2+ or Ruby) except for the code in
 # cgi_multipart_eof_fix-2.3.gem  which is AFL
@@ -17,7 +17,6 @@ URL: http://mongrel.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Source1: http://gems.rubyforge.org/gems/cgi_multipart_eof_fix-2.3.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires: ruby >= 1.8.6
 Requires: rubygems
 BuildRequires: ruby-devel
 Requires: rubygem(daemons) >= 1.0.3
@@ -54,6 +53,7 @@ sed 's.#!/usr/local/bin/ruby.#!/usr/bin/env ruby.' -i %{buildroot}%{geminstdir}/
 chmod a+x %{buildroot}%{geminstdir}/examples/webrick_compare.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/blog.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
+chmod a+x %{buildroot}%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/cgi_multipart_eof_fix_test.rb
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -91,6 +91,9 @@ chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
 %{gemdir}/specifications/cgi_multipart_eof_fix-2.3.gemspec
 
 %changelog
+* Mon Sep  1 2007 Scott Seago <sseago at redhat.com> - 1.0.1-5
+- Include cgi multipart fix
+
 * Fri Aug 24 2007 Scott Seago <sseago at redhat.com> - 1.0.1-4
 - rpmlint fixes
 - added Ruby >= 1.8.6 Requires

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  e757f8379e36af31dc053cbfc60c79380b3de2d6 \
  243ff629e0d1009a6d7630b84728e232a0c666df