rhmessaging commits: r1416 - mgmt/notes.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 12:08:41 -0500 (Mon, 03 Dec 2007)
New Revision: 1416
Modified:
mgmt/notes/justin-todo.txt
Log:
Updates todo items.
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2007-12-03 16:48:53 UTC (rev 1415)
+++ mgmt/notes/justin-todo.txt 2007-12-03 17:08:41 UTC (rev 1416)
@@ -12,6 +12,38 @@
* Add queue journal stats
+ * "unregister broker"
+
+ * "shutdown brokers"
+
+ * "shutdown broker"
+
+ * "load balance brokers"
+
+ * "add brokers to group"
+
+ * "shutdown broker groups"
+
+ * "remove broker groups"
+
+ * "start cluster"
+
+ * "stop cluster"
+
+ * "purge messages from queues"
+
+ * "purge messages from queue"
+
+ * Make mini status tables a little prettier
+
+ * Add legends to charts
+
+ * Add x and y axis values to charts
+
+ * Prepare for journal stats on queue
+
+ * Dispose of old dummy model
+
Deferred
* Add a wooly.focus(id) method to replace the ad-hoc javascript I'm
@@ -25,8 +57,6 @@
* Add a CuminItemSet with add/edit/remove href parts
- * Rename ServerGroupType to ServerGroupCategory
-
* Add a parameter that takes a modelclass
* Make it a little simpler to express hrefs
@@ -37,9 +67,6 @@
* Use wsgiref instead of BaseHTTPServer
- * Make item counts in tab labels a little grayer, that is, less
- intense than the name
-
* Separate wooly stuff into its own devel subdir
* Consider having a cssclass set on widgets
18 years, 4 months
rhmessaging commits: r1415 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 11:48:53 -0500 (Mon, 03 Dec 2007)
New Revision: 1415
Modified:
mgmt/cumin/python/cumin/page.py
Log:
Fixes some links to correctly navigate to broker registrations.
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-12-03 16:41:30 UTC (rev 1414)
+++ mgmt/cumin/python/cumin/page.py 2007-12-03 16:48:53 UTC (rev 1415)
@@ -118,17 +118,17 @@
return self.set_current_frame(session, frame)
def show_queue(self, session, queue):
- frame = self.show_broker(session, queue.vhost.broker)
+ frame = self.show_broker(session, queue.vhost.broker.registration)
frame = frame.show_queue(session, queue)
return self.set_current_frame(session, frame)
def show_exchange(self, session, exchange):
- frame = self.show_broker(session, exchange.vhost.broker)
+ frame = self.show_broker(session, exchange.vhost.broker.registration)
frame = frame.show_exchange(session, exchange)
return self.set_current_frame(session, frame)
def show_client(self, session, client):
- frame = self.show_broker(session, client.vhost.broker)
+ frame = self.show_broker(session, client.vhost.broker.registration)
frame = frame.show_client(session, client)
return self.set_current_frame(session, frame)
18 years, 4 months
rhmessaging commits: r1414 - in mgmt: mint/python/mint and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 11:41:30 -0500 (Mon, 03 Dec 2007)
New Revision: 1414
Modified:
mgmt/cumin/python/cumin/__init__.py
mgmt/mint/python/mint/__init__.py
Log:
Fixes a data bug, where the default value of registration on Broker
was invalid.
Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py 2007-12-03 16:16:29 UTC (rev 1413)
+++ mgmt/cumin/python/cumin/__init__.py 2007-12-03 16:41:30 UTC (rev 1414)
@@ -43,6 +43,11 @@
for reg in BrokerRegistration.select():
self.mint.connectToBroker(reg.host, reg.port or 5672)
+ if reg.broker is None:
+ pass
+ # wait for configCallback to create Broker in db, then
+ # connect it to the reg
+
self.cumin_page = CuminPage(self, "cumin.html")
self.set_default_page(self.cumin_page)
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2007-12-03 16:16:29 UTC (rev 1413)
+++ mgmt/mint/python/mint/__init__.py 2007-12-03 16:41:30 UTC (rev 1414)
@@ -16,7 +16,7 @@
pass
Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", cascade="null",
- default="none", name="registration"))
+ default=None, name="registration"))
class BrokerRegistration(SQLObject):
name = StringCol(length=1000, default=None)
@@ -68,8 +68,8 @@
obj.__init__()
self.idMap[idOriginal] = obj
else:
- print "\n\n=============== %s %d NOT found, NOT creating\n\n" % (objType.__name__, idOriginal)
- #pass
+ #print "\n\n=============== %s %d NOT found, NOT creating\n\n" % (objType.__name__, idOriginal)
+ pass
else:
#print "\n\n=============== %s %d found AFTER QUERY\n\n" % (objType.__name__, idOriginal)
pass
18 years, 4 months
rhmessaging commits: r1413 - in mgmt: mint/python/mint and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 11:16:29 -0500 (Mon, 03 Dec 2007)
New Revision: 1413
Modified:
mgmt/cumin/python/cumin/__init__.py
mgmt/mint/python/mint/__init__.py
Log:
Use connectToBroker instead of addManagedBroker, and remove the api
compat logic.
Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py 2007-12-03 16:01:14 UTC (rev 1412)
+++ mgmt/cumin/python/cumin/__init__.py 2007-12-03 16:16:29 UTC (rev 1413)
@@ -41,7 +41,7 @@
self.model.sys = sys
for reg in BrokerRegistration.select():
- self.mint.addManagedBroker(reg.host, reg.port or 5672)
+ self.mint.connectToBroker(reg.host, reg.port or 5672)
self.cumin_page = CuminPage(self, "cumin.html")
self.set_default_page(self.cumin_page)
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2007-12-03 16:01:14 UTC (rev 1412)
+++ mgmt/mint/python/mint/__init__.py 2007-12-03 16:16:29 UTC (rev 1413)
@@ -190,9 +190,6 @@
else:
return None
- # for compatibility
- addManagedBroker = connectToBroker
-
def registerCallback(self, callback):
self.currentMethodId += 1
methodId = self.currentMethodId
18 years, 4 months
rhmessaging commits: r1412 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 11:01:14 -0500 (Mon, 03 Dec 2007)
New Revision: 1412
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/brokercluster.py
mgmt/cumin/python/cumin/brokergroup.py
mgmt/cumin/python/cumin/brokerprofile.py
Log:
Use SQLObjectItemSet where appropriate.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/broker.py 2007-12-03 16:01:14 UTC (rev 1412)
@@ -105,7 +105,7 @@
class BrokerPaginator(Paginator):
def get_object(self, session, model):
- return list(Broker.select()) #XXX ugh
+ return list(BrokerRegistration.select()) #XXX ugh
class BrokerFrame(CuminFrame):
def __init__(self, app, name):
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokercluster.py 2007-12-03 16:01:14 UTC (rev 1412)
@@ -12,7 +12,7 @@
strings = StringCatalog(__file__)
-class BrokerClusterSet(ItemSet):
+class BrokerClusterSet(SQLObjectItemSet):
def render_cluster_add_href(self, session, model):
branch = session.branch()
self.page().show_broker_cluster_add(branch)
@@ -22,7 +22,7 @@
return "Broker Clusters %s" % fmt_count(BrokerCluster.select().count())
def do_get_items(self, session, model):
- return list(BrokerCluster.select())
+ return BrokerCluster.select()
def render_item_link(self, session, cluster):
branch = session.branch()
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokergroup.py 2007-12-03 16:01:14 UTC (rev 1412)
@@ -10,7 +10,7 @@
strings = StringCatalog(__file__)
-class BrokerGroupSet(ItemSet):
+class BrokerGroupSet(SQLObjectItemSet):
def get_title(self, session, model):
return "Broker Groups %s" % fmt_count(BrokerGroup.select().count())
@@ -20,7 +20,7 @@
return branch.marshal()
def do_get_items(self, session, model):
- return list(BrokerGroup.select())
+ return BrokerGroup.select()
def render_item_link(self, session, group):
branch = session.branch()
Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py 2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokerprofile.py 2007-12-03 16:01:14 UTC (rev 1412)
@@ -11,7 +11,7 @@
strings = StringCatalog(__file__)
-class BrokerProfileSet(ItemSet):
+class BrokerProfileSet(SQLObjectItemSet):
def render_profile_add_href(self, session, profile):
branch = session.branch()
self.page().show_broker_profile_add(branch)
@@ -21,7 +21,7 @@
return "Broker Profiles %s" % fmt_count(BrokerProfile.select().count())
def do_get_items(self, session, model):
- return list(BrokerProfile.select())
+ return BrokerProfile.select()
def render_item_link(self, session, profile):
branch = session.branch()
18 years, 4 months
rhmessaging commits: r1411 - in mgmt/cumin/python: wooly and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 10:57:29 -0500 (Mon, 03 Dec 2007)
New Revision: 1411
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/brokercluster.py
mgmt/cumin/python/cumin/brokergroup.py
mgmt/cumin/python/cumin/brokerprofile.py
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/configproperty.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/measurement.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/realm.py
mgmt/cumin/python/cumin/virtualhost.py
mgmt/cumin/python/cumin/widgets.py
mgmt/cumin/python/wooly/widgets.py
Log:
Because sqlobject is a pita, adds a get_item_count hook to ItemSet and
introduces a SQLObjectItemSet that uses it to avoid calling len() on
sqlobject queries.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/broker.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -15,7 +15,7 @@
strings = StringCatalog(__file__)
-class BrokerSetForm(ItemSet, Form):
+class BrokerSetForm(SQLObjectItemSet, Form):
def __init__(self, app, name):
super(BrokerSetForm, self).__init__(app, name)
@@ -36,9 +36,9 @@
def get_title(self, session, model):
return "Brokers %s" % fmt_count(len(model.get_brokers()))
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
start, end = self.paginator.get_bounds(session)
- return list(BrokerRegistration.select()[start:end])
+ return BrokerRegistration.select()[start:end]
def do_process(self, session, model):
if self.submit.get(session):
@@ -322,7 +322,7 @@
if broker:
return "Functional Hosts %s" % fmt_count(len(broker.vhosts))
- def get_items(self, session, broker):
+ def do_get_items(self, session, broker):
broker = broker.broker # Navigate from registration to real broker
if broker:
return sorted_by(broker.vhosts)
@@ -331,7 +331,7 @@
def get_title(self, session, broker):
return "Configuration"
- def get_items(self, session, broker):
+ def do_get_items(self, session, broker):
return broker.properties
def maybe_highlight(self, value, comparedto):
@@ -383,10 +383,10 @@
self.add_child(self.brokers)
def get_title(self, session, model):
- return "Brokers %s" % fmt_count(Broker.select().count())
+ return "Brokers %s" % fmt_count(BrokerRegistration.select().count())
class BrowserBrokers(BrokerSetForm):
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
group = self.parent().group.get(session)
profile = self.parent().profile.get(session)
cluster = self.parent().cluster.get(session)
@@ -394,8 +394,6 @@
brokers = BrokerRegistration.selectBy \
(profile = profile, cluster = cluster)
- brokers = list(brokers)
-
# XXX add group filtering
return brokers
Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/brokercluster.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -21,7 +21,7 @@
def get_title(self, session, model):
return "Broker Clusters %s" % fmt_count(BrokerCluster.select().count())
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return list(BrokerCluster.select())
def render_item_link(self, session, cluster):
@@ -97,7 +97,7 @@
def get_title(self, session, cluster):
return "Brokers %s" % fmt_count(len(cluster.brokers))
- def get_items(self, session, cluster):
+ def do_get_items(self, session, cluster):
return cluster.brokers
class ClusterStatsTab(Widget):
Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/brokergroup.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -19,7 +19,7 @@
self.page().show_broker_group_add(branch)
return branch.marshal()
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return list(BrokerGroup.select())
def render_item_link(self, session, group):
@@ -90,7 +90,7 @@
def get_title(self, session, group):
return "Brokers %s" % fmt_count(len(group.brokers))
- def get_items(self, session, group):
+ def do_get_items(self, session, group):
return group.brokers
class BrokerGroupForm(CuminForm):
@@ -136,7 +136,7 @@
self.group_name.set(session, group.name)
class BrokerGroupInput(OptionInputSet):
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return model.get_broker_groups()
def render_item_value(self, session, group):
Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/brokerprofile.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -20,7 +20,7 @@
def get_title(self, session, model):
return "Broker Profiles %s" % fmt_count(BrokerProfile.select().count())
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return list(BrokerProfile.select())
def render_item_link(self, session, profile):
@@ -68,7 +68,7 @@
return profile.name
class ProfileConfigTab(ConfigPropertySet):
- def get_items(self, session, profile):
+ def do_get_items(self, session, profile):
return sorted_by(profile.properties)
def get_title(self, session, profile):
@@ -81,7 +81,7 @@
def get_title(self, session, profile):
return "Brokers %s" % fmt_count(len(profile.brokers))
- def get_items(self, session, profile):
+ def do_get_items(self, session, profile):
return profile.brokers
def render_item_config_href(self, session, broker):
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/client.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -22,7 +22,7 @@
def render_unit_plural(self, session, vhost):
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
if vhost:
return sorted_by(vhost.clients, "ipAddr")
@@ -155,7 +155,7 @@
def get_title(self, session, client):
return "Sessions %s" % fmt_count(len(client.session_items()))
- def get_items(self, session, client):
+ def do_get_items(self, session, client):
return sorted_by(client.session_items())
def render_item_name(self, session, session_):
Modified: mgmt/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/cumin/python/cumin/configproperty.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/configproperty.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -6,7 +6,7 @@
from util import *
class ConfigPropertySet(ItemSet):
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return sorted_by(model.get_config_properties())
def render_item_name(self, session, prop):
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/exchange.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -20,7 +20,7 @@
self.add_parameter(param)
self.set_parameter(param)
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
return sorted_by(vhost.exchanges)
def render_item_value(self, session, exchange):
@@ -45,7 +45,7 @@
def render_unit_plural(self, session, vhost):
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
if vhost:
return sorted_by(vhost.exchanges)
@@ -196,7 +196,7 @@
def get_title(self, session, exchange):
return "Queue Bindings %s" % fmt_count(len(exchange.bindings))
- def get_items(self, session, exchange):
+ def do_get_items(self, session, exchange):
return sorted_by(exchange.bindings, "id")
def render_item_href(self, session, binding):
@@ -371,7 +371,7 @@
def get_title(self, session, queue):
return "Producers %s" % fmt_count(len(queue.producers))
- def get_items(self, session, queue):
+ def do_get_items(self, session, queue):
return sorted_by(queue.producers)
def render_item_name(self, session, producer):
Modified: mgmt/cumin/python/cumin/measurement.py
===================================================================
--- mgmt/cumin/python/cumin/measurement.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/measurement.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -22,7 +22,7 @@
self.object = Attribute(app, "object");
self.add_attribute(self.object);
- def get_items(self, session, object):
+ def do_get_items(self, session, object):
stats = list()
cls = self.app.cmodel.get_class(object)
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/queue.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -29,7 +29,7 @@
def render_unit_plural(self, session, vhost):
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
if vhost:
return sorted_by(vhost.queues)
@@ -204,7 +204,7 @@
def get_title(self, session, queue):
return "Exchange Bindings %s" % fmt_count(len(queue.bindings))
- def get_items(self, session, queue):
+ def do_get_items(self, session, queue):
return sorted_by(queue.bindings, "id")
def render_item_href(self, session, binding):
@@ -421,7 +421,7 @@
self.process_cancel(session, queue)
class Exchanges(ExchangeInputSet):
- def get_items(self, session, queue):
+ def do_get_items(self, session, queue):
return sorted_by(queue.virtual_host.exchange_items())
class QueueBindingRemove(CuminConfirmForm):
@@ -488,7 +488,7 @@
def get_title(self, session, queue):
return "Consumers" #XXX %s" % fmt_count(len(queue.consumers))
- def get_items(self, session, queue):
+ def do_get_items(self, session, queue):
return list() #XXX sorted_by(queue.consumers)
def render_item_name(self, session, consumer):
Modified: mgmt/cumin/python/cumin/realm.py
===================================================================
--- mgmt/cumin/python/cumin/realm.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/realm.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -13,7 +13,7 @@
def get_title(self, session, vhost):
return "Realms %s" % fmt_count(len(vhost.realm_items()))
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
return sorted_by(vhost.realm_items())
def render_item_name(self, session, realm):
@@ -27,7 +27,7 @@
self.add_parameter(param)
self.set_parameter(param)
- def get_items(self, session, vhost):
+ def do_get_items(self, session, vhost):
return sorted_by(vhost.realm_items())
# just parked here
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/virtualhost.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -16,7 +16,7 @@
return "Functional Hosts %s" % \
fmt_count(len(model.get_virtual_hosts()))
- def get_items(self, session, model):
+ def do_get_items(self, session, model):
return sorted_by(model.get_virtual_hosts())
def render_item_link(self, session, vhost):
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/cumin/widgets.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -1,4 +1,5 @@
from math import ceil
+from sqlobject.sresults import SelectResults
from wooly import *
from wooly.widgets import *
from wooly.forms import *
@@ -283,7 +284,7 @@
page = self.get(session)
return (self.page_size * page, self.page_size * (page + 1))
- def get_items(self, session, object):
+ def do_get_items(self, session, object):
return range(0, int(ceil(len(object) / float(self.page_size))))
def render_item_class_attr(self, session, page):
@@ -297,3 +298,13 @@
def render_item_content(self, session, page):
return page + 1
+
+class SQLObjectItemSet(ItemSet):
+ def get_item_count(self, session, object):
+ items = self.get_items(session, object)
+
+ if isinstance(items, SelectResults):
+ return items.count()
+ else:
+ return super(SQLObjectItemSet, self).get_item_count \
+ (session, object)
Modified: mgmt/cumin/python/wooly/widgets.py
===================================================================
--- mgmt/cumin/python/wooly/widgets.py 2007-12-03 15:08:14 UTC (rev 1410)
+++ mgmt/cumin/python/wooly/widgets.py 2007-12-03 15:57:29 UTC (rev 1411)
@@ -120,16 +120,31 @@
def __init__(self, app, name):
super(ItemSet, self).__init__(app, name)
+ self.items = Attribute(app, "items")
+ self.add_attribute(self.items)
+
self.item_tmpl = Template(self, "item_html")
+ def get_item_count(self, session, object):
+
+ return len(self.get_items(session, object))
+
def get_items(self, session, object):
- return None
+ items = self.items.get(session)
+ if items is None:
+ items = self.do_get_items(session, object)
+
+ if items is None:
+ items = ()
+
+ return items
+
+ def do_get_items(self, session, object):
+ return ()
+
def do_render(self, session, object):
- # XXX don't do this twice
- items = self.get_items(session, object)
-
- if items:
+ if self.get_item_count(session, object):
html = super(ItemSet, self).do_render(session, object)
else:
html = self.render_none(session, object)
18 years, 4 months
rhmessaging commits: r1410 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 10:08:14 -0500 (Mon, 03 Dec 2007)
New Revision: 1410
Modified:
mgmt/cumin/python/cumin/broker.py
Log:
Restores the profile and cluster filtering of the broker browser.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-12-03 15:02:07 UTC (rev 1409)
+++ mgmt/cumin/python/cumin/broker.py 2007-12-03 15:08:14 UTC (rev 1410)
@@ -387,30 +387,17 @@
class BrowserBrokers(BrokerSetForm):
def get_items(self, session, model):
- return super(BrokerBrowser.BrowserBrokers, self).get_items \
- (session, model)
-
- brokers = sorted_by(model.get_brokers())
group = self.parent().group.get(session)
profile = self.parent().profile.get(session)
cluster = self.parent().cluster.get(session)
- for broker in model.get_brokers():
- if group and group not in broker.broker_group_items():
- brokers.remove(broker)
+ brokers = BrokerRegistration.selectBy \
+ (profile = profile, cluster = cluster)
- if profile and profile is not broker.get_broker_profile():
- try:
- brokers.remove(broker)
- except ValueError:
- pass
-
- if cluster and cluster is not broker.get_broker_cluster():
- try:
- brokers.remove(broker)
- except ValueError:
- pass
+ brokers = list(brokers)
+ # XXX add group filtering
+
return brokers
def render_none(self, session, model):
@@ -429,21 +416,21 @@
return branch.marshal()
def render_group_filters(self, session, model):
- groups = sorted_by(model.get_broker_groups())
+ groups = BrokerGroup.select()
return self._render_filters(session, groups, self.group_tmpl)
def render_group_link(self, session, group):
return self._render_filter_link(session, group, self.group)
def render_profile_filters(self, session, model):
- profiles = sorted_by(model.get_broker_profiles())
+ profiles = BrokerProfile.select()
return self._render_filters(session, profiles, self.profile_tmpl)
def render_profile_link(self, session, profile):
return self._render_filter_link(session, profile, self.profile)
def render_cluster_filters(self, session, model):
- clusters = sorted_by(model.get_broker_clusters())
+ clusters = BrokerCluster.select()
return self._render_filters(session, clusters, self.cluster_tmpl)
def render_cluster_link(self, session, cluster):
18 years, 4 months
rhmessaging commits: r1409 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2007-12-03 10:02:07 -0500 (Mon, 03 Dec 2007)
New Revision: 1409
Modified:
store/trunk/cpp/lib/BdbMessageStore.cpp
Log:
Fix for BZ 403051 (Failures in perftest fanout mode with async persistence).
Modified: store/trunk/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-03 14:22:08 UTC (rev 1408)
+++ store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-03 15:02:07 UTC (rev 1409)
@@ -1044,8 +1044,8 @@
}
msg->dequeueComplete();
- if ( msg->isDequeueComplete() ) // clear id after last dequeue
- msg->setPersistenceId(0);
+// if ( msg->isDequeueComplete() ) // clear id after last dequeue
+// msg->setPersistenceId(0);
} else if (txn->isTPC()) {
//if this is part of a 2pc transaction, then only record the dequeue now,
18 years, 4 months
rhmessaging commits: r1408 - in mgmt: mint/python/mint and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2007-12-03 09:22:08 -0500 (Mon, 03 Dec 2007)
New Revision: 1408
Modified:
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/parameters.py
mgmt/cumin/python/cumin/queue.py
mgmt/mint/python/mint/__init__.py
mgmt/mint/python/mint/schema.sql
Log:
Adds a registration assoc endpoint to Broker.
Makes the broker view work with broker registrations that are not
attached to a real broker.
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/cumin/python/cumin/broker.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -38,7 +38,7 @@
def get_items(self, session, model):
start, end = self.paginator.get_bounds(session)
- return list(Broker.select()[start:end])
+ return list(BrokerRegistration.select()[start:end])
def do_process(self, session, model):
if self.submit.get(session):
@@ -149,7 +149,7 @@
return self.show_mode(session, self.client)
def get_title(self, session, broker):
- return "Broker '%s'" % broker.port
+ return "Broker '%s'" % broker.name
class BrokerConfigPropertyForm(CuminForm, Frame):
def __init__(self, app, name):
@@ -248,8 +248,8 @@
self.tabs.add_tab(self.BrokerQueueTab(app, "queues"))
self.tabs.add_tab(self.BrokerExchangeTab(app, "exchanges"))
self.tabs.add_tab(self.BrokerClientTab(app, "clients"))
- self.config = self.BrokerConfigTab(app, "config")
- self.tabs.add_tab(self.config)
+ #self.config = self.BrokerConfigTab(app, "config")
+ #self.tabs.add_tab(self.config)
self.tabs.add_tab(self.BrokerStatsTab(app, "stats"))
self.tabs.add_tab(self.BrokerLogTab(app, "log"))
@@ -257,13 +257,13 @@
return self.tabs.show_mode(session, self.config)
def get_title(self, session, broker):
- return "Broker '%s'" % broker.port
+ return "Broker '%s'" % broker.name
def render_name(self, session, broker):
- return broker.port
+ return broker.name
def render_cluster_link(self, session, broker):
- cluster = None #broker.get_broker_cluster()
+ cluster = broker.cluster
if cluster:
branch = session.branch()
@@ -273,7 +273,7 @@
return fmt_none()
def render_profile_link(self, session, broker):
- profile = None #broker.get_broker_profile()
+ profile = broker.profile
if profile:
branch = session.branch()
@@ -288,41 +288,51 @@
class BrokerQueueTab(QueueSet):
def get_title(self, session, broker):
vhost = self.get_object(session, broker)
- return "Queues %s" % fmt_count(len(vhost.queues))
+ return "Queues %s" % fmt_count(vhost and len(vhost.queues) or 0)
def get_object(self, session, broker):
- return Vhost.selectBy(broker=broker, name="/")[0]
+ broker = broker.broker # Navigate from registration to real broker
+ if broker:
+ return Vhost.selectBy(broker=broker, name="/")[0]
class BrokerExchangeTab(ExchangeSet):
def get_title(self, session, broker):
vhost = self.get_object(session, broker)
- return "Exchanges %s" % fmt_count(len(vhost.exchanges))
+ return "Exchanges %s" \
+ % fmt_count(vhost and len(vhost.exchanges) or 0)
def get_object(self, session, broker):
- return Vhost.selectBy(broker=broker, name="/")[0]
+ broker = broker.broker # Navigate from registration to real broker
+ if broker:
+ return Vhost.selectBy(broker=broker, name="/")[0]
class BrokerClientTab(ClientSet):
def get_title(self, session, broker):
vhost = self.get_object(session, broker)
- return "Clients %s" % fmt_count(len(vhost.clients))
+ return "Clients %s" % fmt_count(vhost and len(vhost.clients) or 0)
def get_object(self, session, broker):
- return Vhost.selectBy(broker=broker, name="/")[0]
+ broker = broker.broker # Navigate from registration to real broker
+ if broker:
+ return Vhost.selectBy(broker=broker, name="/")[0]
class BrokerVirtualHostTab(VirtualHostSet):
def get_title(self, session, broker):
- return "Functional Hosts %s" % \
- fmt_count(len(broker.vhosts))
+ broker = broker.broker # Navigate from registration to real broker
+ if broker:
+ return "Functional Hosts %s" % fmt_count(len(broker.vhosts))
def get_items(self, session, broker):
- return sorted_by(broker.vhosts)
+ broker = broker.broker # Navigate from registration to real broker
+ if broker:
+ return sorted_by(broker.vhosts)
class BrokerConfigTab(ConfigPropertySet):
def get_title(self, session, broker):
return "Configuration"
def get_items(self, session, broker):
- return list() #XXX sorted_by(broker.config_property_items())
+ return broker.properties
def maybe_highlight(self, value, comparedto):
if str(value) != str(comparedto):
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/cumin/python/cumin/client.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -23,7 +23,8 @@
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
def get_items(self, session, vhost):
- return sorted_by(vhost.clients, "ipAddr")
+ if vhost:
+ return sorted_by(vhost.clients, "ipAddr")
def render_item_link(self, session, client):
branch = session.branch()
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/cumin/python/cumin/exchange.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -46,7 +46,8 @@
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
def get_items(self, session, vhost):
- return sorted_by(vhost.exchanges)
+ if vhost:
+ return sorted_by(vhost.exchanges)
def render_item_link(self, session, exchange):
branch = session.branch()
Modified: mgmt/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/cumin/python/cumin/parameters.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/cumin/python/cumin/parameters.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -17,7 +17,7 @@
class BrokerParameter(Parameter):
def do_unmarshal(self, string):
- return Broker.get(int(string))
+ return BrokerRegistration.get(int(string))
def do_marshal(self, broker):
return str(broker.id)
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/cumin/python/cumin/queue.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -30,7 +30,8 @@
return self.unit.get(session) == "b" and "Bytes" or "Msgs."
def get_items(self, session, vhost):
- return sorted_by(vhost.queues)
+ if vhost:
+ return sorted_by(vhost.queues)
def render_item_link(self, session, queue):
branch = session.branch()
Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/mint/python/mint/__init__.py 2007-12-03 14:22:08 UTC (rev 1408)
@@ -15,6 +15,9 @@
except TypeError:
pass
+Broker.sqlmeta.addColumn(ForeignKey("BrokerRegistration", cascade="null",
+ default="none", name="registration"))
+
class BrokerRegistration(SQLObject):
name = StringCol(length=1000, default=None)
host = StringCol(length=1000, default=None)
@@ -41,7 +44,6 @@
name = StringCol(length=1000, default=None)
value = StringCol(length=1000, default=None)
type = StringCol(length=1, default="s")
- profile = ForeignKey("BrokerProfile", cascade="null", default=None)
class OriginalIdDict:
def __init__(self):
Modified: mgmt/mint/python/mint/schema.sql
===================================================================
--- mgmt/mint/python/mint/schema.sql 2007-11-30 22:57:44 UTC (rev 1407)
+++ mgmt/mint/python/mint/schema.sql 2007-12-03 14:22:08 UTC (rev 1408)
@@ -78,7 +78,8 @@
initial_disk_page_size INT,
initial_pages_per_queue INT,
cluster_name VARCHAR(1000),
- version VARCHAR(1000)
+ version VARCHAR(1000),
+ registration_id INT
);
CREATE TABLE broker_stats (
@@ -398,6 +399,8 @@
ALTER TABLE broker ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL;
+ALTER TABLE broker ADD CONSTRAINT registration_id_exists FOREIGN KEY (registration_id) REFERENCES broker_registration (id) ON DELETE SET NULL;
+
ALTER TABLE broker_stats ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL;
ALTER TABLE client ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES client_stats (id) ON DELETE SET NULL;
18 years, 4 months