client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 6 +++++-
rel-eng/packages/osad | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 1dc7ebc1541b168d676647d0f8a872052b41cc69
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 8 17:09:31 2013 +0100
Automatic commit of package [osad] release [5.11.31-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index bf50963..25e6954 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.30
+Version: 5.11.31
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -388,6 +388,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Nov 08 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 5.11.31-1
+- 917070 - catch jabberd connection errors
+
* Thu Oct 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.30-1
- cleaning up old svn Ids
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index af2e46f..c26c70c 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.30-1 client/tools/osad/
+5.11.31-1 client/tools/osad/
commit 3ba1b7276d6e9d7c39bacb67d69d13404bc3dc33
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 8 17:05:57 2013 +0100
917070 - catch jabberd connection errors
This fix is to avoid an ugly traceback which is printed into the console
when osa-dispatcher starts while jabberd is down. With this fix, even
when jabberd is down, osa-dispatcher will print an error message, yet
the service will report a starting success -- not to break osad
and previously expected behavior. After jabberd starts, osa-dispatcher
will eventually connect to it.
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index b8819f0..b3d5069 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -564,7 +564,11 @@ class JabberClient(jabber.Client):
log_debug(5, "Attempting to connect")
for retry in range(0,3):
- jabber.Client.connect(self)
+ try:
+ jabber.Client.connect(self)
+ except except socket.error, e:
+ log_error("Error connecting to jabber server: %s" % e)
+ raise JabberConnectionError(e)
log_debug(5, "Connected")