rhmessaging commits: r1690 - mgmt.
by rhmessaging-commits@lists.jboss.org
Author: rschloming
Date: 2008-02-12 11:47:48 -0500 (Tue, 12 Feb 2008)
New Revision: 1690
Modified:
mgmt/cumin.spec
Log:
removed extraneous whitespace
Modified: mgmt/cumin.spec
===================================================================
--- mgmt/cumin.spec 2008-02-12 16:33:42 UTC (rev 1689)
+++ mgmt/cumin.spec 2008-02-12 16:47:48 UTC (rev 1690)
@@ -94,4 +94,3 @@
* Fri Jan 18 2008 Nuno Santos <nsantos(a)redhat.com> - 0.1-1
- Initial build.
-
18 years, 2 months
rhmessaging commits: r1688 - mgmt.
by rhmessaging-commits@lists.jboss.org
Author: nunofsantos
Date: 2008-02-11 17:09:02 -0500 (Mon, 11 Feb 2008)
New Revision: 1688
Modified:
mgmt/cumin.spec
Log:
fix for multiple broker registrations
Modified: mgmt/cumin.spec
===================================================================
--- mgmt/cumin.spec 2008-02-11 21:54:49 UTC (rev 1687)
+++ mgmt/cumin.spec 2008-02-11 22:09:02 UTC (rev 1688)
@@ -1,7 +1,7 @@
Summary: management component of MRG
Name: cumin
Version: 0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPL
Group: System Environment/Libraries
URL: http://redhat.com/mrg
@@ -79,6 +79,9 @@
%{python_sitelib}/wooly
%changelog
+* Mon Feb 11 2008 Nuno Santos <nsantos(a)redhat.com> - 0.1-5
+- Fix for multiple broker registrations
+
* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 0.1-4
- Bumped for Beta 3 update
18 years, 2 months
rhmessaging commits: r1687 - mgmt/mint/python/mint.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 16:54:49 -0500 (Mon, 11 Feb 2008)
New Revision: 1687
Modified:
mgmt/mint/python/mint/__init__.py
Log:
Proptect against managedBroker not being set.
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2008-02-11 21:49:41 UTC (rev 1686)
+++ mgmt/mint/python/mint/__init__.py 2008-02-11 21:54:49 UTC (rev 1687)
@@ -87,7 +87,7 @@
#print "\n\n=============== %s %d found AFTER QUERY\n\n" % (objType.__name__, idOriginal)
pass
- if obj and obj.__class__ is Broker:
+ if obj and obj.__class__ is Broker and obj.managedBroker:
host, port = obj.managedBroker.split(":")
port = int(port)
existing = list(obj.registrations)
18 years, 2 months
rhmessaging commits: r1686 - mgmt/mint/python/mint.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 16:49:41 -0500 (Mon, 11 Feb 2008)
New Revision: 1686
Modified:
mgmt/mint/python/mint/__init__.py
Log:
Use a 1-n join instead of a 1-1 mapping between broker and broker
registration.
Update the broker attach logic accordingly.
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2008-02-11 19:53:55 UTC (rev 1685)
+++ mgmt/mint/python/mint/__init__.py 2008-02-11 21:49:41 UTC (rev 1686)
@@ -17,8 +17,8 @@
except TypeError:
pass
-Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", cascade="null",
- default=None, name="registration"))
+Broker.sqlmeta.addJoin(SQLMultipleJoin("BrokerRegistration",
+ joinMethodName="registrations"))
class BrokerRegistration(SQLObject):
name = StringCol(length=1000, default=None)
@@ -87,18 +87,17 @@
#print "\n\n=============== %s %d found AFTER QUERY\n\n" % (objType.__name__, idOriginal)
pass
- if obj and obj.__class__ is Broker and obj.registration is None:
- if obj.managedBroker:
- host, port = obj.managedBroker.split(":")
- port = int(port)
+ if obj and obj.__class__ is Broker:
+ host, port = obj.managedBroker.split(":")
+ port = int(port)
+ existing = list(obj.registrations)
+ regs = BrokerRegistration.selectBy(host=host, port=port)
- regs = BrokerRegistration.selectBy(host=host, port=port)
-
- for reg in regs:
+ for reg in regs:
+ if reg not in existing:
print "Attaching broker to reg", reg
-
+
reg.broker = obj
- obj.registration = reg
obj.syncUpdate()
return obj
18 years, 2 months
rhmessaging commits: r1685 - mgmt/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 14:53:55 -0500 (Mon, 11 Feb 2008)
New Revision: 1685
Modified:
mgmt/cumin/python/cumin/test.py
Log:
Move exception message handling into a method on TestCall.
Modified: mgmt/cumin/python/cumin/test.py
===================================================================
--- mgmt/cumin/python/cumin/test.py 2008-02-11 19:44:14 UTC (rev 1684)
+++ mgmt/cumin/python/cumin/test.py 2008-02-11 19:53:55 UTC (rev 1685)
@@ -69,7 +69,7 @@
if self.failed:
for call in self.failed:
out.write(" %s: %s" % \
- (call.test.path(), call.exception.message))
+ (call.test.path(), call.get_exception_text()))
out.write(os.linesep)
for spec in extract_tb(call.traceback):
@@ -162,17 +162,23 @@
status = "-"
if self.exception:
- status = self.exception.__class__.__name__
+ status = self.get_exception_text()
- if hasattr(self.exception, "message"):
- status = status + ": " + self.exception.message
-
writer.write("%-40s %s" % (entry, status))
writer.write(os.linesep)
for call in self.callees:
call.report(writer, depth + 1)
+ def get_exception_text(self):
+ if self.exception:
+ message = self.exception.__class__.__name__
+
+ if hasattr(self.exception, "message"):
+ message = message + ": " + self.exception.message
+
+ return message
+
class MainTest(Test):
def __init__(self, env):
super(MainTest, self).__init__(env, None)
18 years, 2 months
rhmessaging commits: r1684 - mgmt/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 14:44:14 -0500 (Mon, 11 Feb 2008)
New Revision: 1684
Modified:
mgmt/cumin/python/cumin/test.py
Log:
This line was supposed to be removed in change 1682.
Modified: mgmt/cumin/python/cumin/test.py
===================================================================
--- mgmt/cumin/python/cumin/test.py 2008-02-11 19:40:28 UTC (rev 1683)
+++ mgmt/cumin/python/cumin/test.py 2008-02-11 19:44:14 UTC (rev 1684)
@@ -167,8 +167,6 @@
if hasattr(self.exception, "message"):
status = status + ": " + self.exception.message
- status = self.exception and self.exception.message or "-"
-
writer.write("%-40s %s" % (entry, status))
writer.write(os.linesep)
18 years, 2 months
rhmessaging commits: r1683 - mgmt.
by rhmessaging-commits@lists.jboss.org
Author: nunofsantos
Date: 2008-02-11 14:40:28 -0500 (Mon, 11 Feb 2008)
New Revision: 1683
Modified:
mgmt/mrg-management.spec
Log:
bump for beta 3 update
Modified: mgmt/mrg-management.spec
===================================================================
--- mgmt/mrg-management.spec 2008-02-11 19:36:05 UTC (rev 1682)
+++ mgmt/mrg-management.spec 2008-02-11 19:40:28 UTC (rev 1683)
@@ -1,7 +1,7 @@
Summary: MRG - management component
Name: mrg-management
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL
Group: System Environment/Libraries
URL: http://redhat.com/mrg
@@ -29,6 +29,9 @@
%changelog
+* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 1.0-2
+- Bump for Beta 3 update
+
* Fri Jan 18 2008 Nuno Santos <nsantos(a)redhat.com> - 1.0-1
- Initial build.
18 years, 2 months
rhmessaging commits: r1682 - mgmt/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 14:36:05 -0500 (Mon, 11 Feb 2008)
New Revision: 1682
Modified:
mgmt/cumin/python/cumin/test.py
Log:
Make sure exceptions have a message attr before trying to print it.
Modified: mgmt/cumin/python/cumin/test.py
===================================================================
--- mgmt/cumin/python/cumin/test.py 2008-02-11 19:06:55 UTC (rev 1681)
+++ mgmt/cumin/python/cumin/test.py 2008-02-11 19:36:05 UTC (rev 1682)
@@ -159,6 +159,14 @@
def report(self, writer, depth):
entry = (" " * depth) + str(self.test)
+ status = "-"
+
+ if self.exception:
+ status = self.exception.__class__.__name__
+
+ if hasattr(self.exception, "message"):
+ status = status + ": " + self.exception.message
+
status = self.exception and self.exception.message or "-"
writer.write("%-40s %s" % (entry, status))
18 years, 2 months
rhmessaging commits: r1681 - mgmt/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: justi9
Date: 2008-02-11 14:06:55 -0500 (Mon, 11 Feb 2008)
New Revision: 1681
Modified:
mgmt/cumin/python/cumin/exchange.py
Log:
Provisional fix for an intermittent page crash.
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2008-02-11 18:58:46 UTC (rev 1680)
+++ mgmt/cumin/python/cumin/exchange.py 2008-02-11 19:06:55 UTC (rev 1681)
@@ -259,7 +259,8 @@
return branch.marshal()
def render_item_name(self, session, binding):
- return binding.queue.name
+ if binding.queue:
+ return binding.queue.name
class ExchangeForm(CuminForm):
def __init__(self, app, name):
18 years, 2 months
rhmessaging commits: r1680 - store/trunk/cpp.
by rhmessaging-commits@lists.jboss.org
Author: nunofsantos
Date: 2008-02-11 13:58:46 -0500 (Mon, 11 Feb 2008)
New Revision: 1680
Modified:
store/trunk/cpp/rhm.spec.in
Log:
fix dates in changelog
Modified: store/trunk/cpp/rhm.spec.in
===================================================================
--- store/trunk/cpp/rhm.spec.in 2008-02-11 18:58:09 UTC (rev 1679)
+++ store/trunk/cpp/rhm.spec.in 2008-02-11 18:58:46 UTC (rev 1680)
@@ -86,7 +86,7 @@
%changelog
-* Mon Feb 11 2007 Rafael Schloming <rafaels(a)redhat.com> - 0.2-15
+* Mon Feb 11 2008 Rafael Schloming <rafaels(a)redhat.com> - 0.2-15
- Bumped for Beta 3 update
* Tue Jan 22 2008 Nuno Santos <nsantos(a)redhat.com> - 0.2-14
18 years, 2 months