[rhmessaging-commits] rhmessaging commits: r1417 - in mgmt/cumin: python/cumin and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Mon Dec 3 14:11:22 EST 2007
Author: justi9
Date: 2007-12-03 14:11:22 -0500 (Mon, 03 Dec 2007)
New Revision: 1417
Modified:
mgmt/cumin/bin/cumin-test
mgmt/cumin/python/cumin/__init__.py
mgmt/cumin/python/cumin/broker.py
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/measurement.py
mgmt/cumin/python/cumin/model.py
mgmt/cumin/python/cumin/parameters.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/widgets.py
Log:
Removes all the old dummy data.
Modified: mgmt/cumin/bin/cumin-test
===================================================================
--- mgmt/cumin/bin/cumin-test 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/bin/cumin-test 2007-12-03 19:11:22 UTC (rev 1417)
@@ -65,8 +65,7 @@
from cumin.model import *
def do_main(port, bench_hits, debug=True):
- model = DummyModel()
- app = Cumin(model)
+ app = Cumin()
if debug or bench_hits:
app.enable_debug()
Modified: mgmt/cumin/python/cumin/__init__.py
===================================================================
--- mgmt/cumin/python/cumin/__init__.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/__init__.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -9,7 +9,7 @@
from mint import *
from sqlobject.main import *
-from model import DummyModel, CuminModel
+from model import CuminModel
from demo import DemoData
from page import CuminPage
from queue import QueueXmlPage, QueueChartPage
@@ -17,7 +17,7 @@
from client import ClientXmlPage, ClientChartPage
class Cumin(Application):
- def __init__(self, model):
+ def __init__(self):
super(Cumin, self).__init__()
try:
@@ -27,21 +27,10 @@
self.add_resource_dir(os.path.join(self.home, "resources"))
- self.model = model
- self.cmodel = CuminModel()
+ self.model = CuminModel()
- self.mint = MintModel()
-
- try:
- sys = System.get(1)
- except SQLObjectNotFound:
- sys = System()
- sys.set(sysId=0, idOriginal=0)
-
- self.model.sys = sys
-
for reg in BrokerRegistration.select():
- self.mint.connectToBroker(reg.host, reg.port or 5672)
+ self.model.data.connectToBroker(reg.host, reg.port or 5672)
if reg.broker is None:
pass
Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/broker.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -528,7 +528,7 @@
def render_groups(self, session, index):
writer = Writer()
- for group in self.app.model.get_broker_groups():
+ for group in BrokerGroup.select():
self.group_tmpl.render(session, (index, group), writer)
return writer.to_string()
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/exchange.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -69,19 +69,19 @@
def render_item_received(self, session, exchange):
unit = self.unit.get(session)
key = unit == "b" and "byteReceives" or "msgReceives"
- value = self.app.cmodel.exchange.get_stat(key).rate(exchange)
+ value = self.app.model.exchange.get_stat(key).rate(exchange)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_routed(self, session, exchange):
unit = self.unit.get(session)
key = unit == "b" and "byteRoutes" or "msgRoutes"
- value = self.app.cmodel.exchange.get_stat(key).rate(exchange)
+ value = self.app.model.exchange.get_stat(key).rate(exchange)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_dropped(self, session, exchange):
unit = self.unit.get(session)
key = unit == "b" and "byteDrops" or "msgDrops"
- return self.app.cmodel.exchange.get_stat(key).value(exchange)
+ return self.app.model.exchange.get_stat(key).value(exchange)
def render_item_status(self, session, exchange):
return fmt_ostatus(exchange)
@@ -110,8 +110,8 @@
def get_object(self, session, object):
exchange = self.param.get(session)
# XXX
- #self.app.cmodel.get_stat(exchange, "producers").link_cb = show_producers
- #self.app.cmodel.get_stat(exchange, "bindings").link_cb = show_bindings
+ #self.app.model.get_stat(exchange, "producers").link_cb = show_producers
+ #self.app.model.get_stat(exchange, "bindings").link_cb = show_bindings
return exchange
def get_title(self, session, exchange):
@@ -122,22 +122,22 @@
return "exchange.xml?id=%i" % exchange.id
def render_messages_received(self, session, exchange):
- value = self.app.cmodel.exchange.get_stat("msgReceives").rate(exchange)
+ value = self.app.model.exchange.get_stat("msgReceives").rate(exchange)
return fmt_rate(value, "msg", "sec")
def render_messages_routed(self, session, exchange):
- value = self.app.cmodel.exchange.get_stat("msgRoutes").rate(exchange)
+ value = self.app.model.exchange.get_stat("msgRoutes").rate(exchange)
return fmt_rate(value, "msg", "sec")
def render_messages_dropped(self, session, exchange):
- return self.app.cmodel.exchange.get_stat("msgDrops").value(exchange)
+ return self.app.model.exchange.get_stat("msgDrops").value(exchange)
def render_bytes_received(self, session, exchange):
- value = self.app.cmodel.exchange.get_stat("byteReceives").rate(exchange)
+ value = self.app.model.exchange.get_stat("byteReceives").rate(exchange)
return fmt_rate(value, "byte", "sec")
def render_bytes_routed(self, session, exchange):
- value = self.app.cmodel.exchange.get_stat("byteRoutes").rate(exchange)
+ value = self.app.model.exchange.get_stat("byteRoutes").rate(exchange)
return fmt_rate(value, "byte", "sec")
def render_bytes_dropped(self, session, exchange):
@@ -271,17 +271,12 @@
def process_submit(self, session, vhost):
if self.validate(session):
- exchange = Exchange(self.app.model)
+ exchange = Exchange()
+ exchange.name = self.exchange_name.get(session)
+ exchange.type = self.type.get(session)
- exchange.lock()
- try:
- exchange.name = self.exchange_name.get(session)
- exchange.type = self.type.get(session)
- finally:
- exchange.unlock()
+ vhost.addExchange(exchange)
- vhost.add_exchange(exchange)
-
branch = session.branch()
self.page().show_exchange(branch, exchange).show_view(branch)
self.page().set_redirect_url(session, branch.marshal())
Modified: mgmt/cumin/python/cumin/measurement.py
===================================================================
--- mgmt/cumin/python/cumin/measurement.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/measurement.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -24,7 +24,7 @@
def do_get_items(self, session, object):
stats = list()
- cls = self.app.cmodel.get_class(object)
+ cls = self.app.model.get_class(object)
for stat in cls.stats:
if self.category in stat.categories:
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/model.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -1,11 +1,12 @@
-import mint
+from mint import *
from wooly import *
-from wooly.model import *
from util import *
-class CuminModel(object):
+class CuminModel():
def __init__(self):
+ self.data = MintModel()
+
self.classes = dict()
self.queue = CuminQueue(self)
@@ -105,9 +106,9 @@
class CuminQueue(CuminClass):
def __init__(self, model):
- super(CuminQueue, self).__init__(model, "queue", mint.Queue)
+ super(CuminQueue, self).__init__(model, "queue", Queue)
- self.mint_stats_class = mint.QueueStats
+ self.mint_stats_class = QueueStats
stat = CuminStat(self, "consumers", "int")
stat.title = "Consumers"
@@ -270,9 +271,9 @@
class CuminExchange(CuminClass):
def __init__(self, model):
- super(CuminExchange, self).__init__(model, "exchange", mint.Exchange)
+ super(CuminExchange, self).__init__(model, "exchange", Exchange)
- self.mint_stats_class = mint.ExchangeStats
+ self.mint_stats_class = ExchangeStats
stat = CuminStat(self, "producers", "int")
stat.title = "Producers"
@@ -324,794 +325,3 @@
self.write_stat_xml(exchange, writer)
writer.write("</exchange>")
-
-class DummyModel(Model):
- def __init__(self):
- super(DummyModel, self).__init__()
-
- self.broker = ModelClass(self, "broker")
- self.broker_cluster = ModelClass(self, "broker_cluster")
- self.broker_profile = ModelClass(self, "broker_profile")
- self.config_property = ModelClass(self, "config_property")
- self.broker_group = ModelClass(self, "broker_group")
- self.broker_group_type = ModelClass(self, "broker_group_type")
- self.virtual_host = ModelClass(self, "virtual_host")
- self.virtual_host_group = ModelClass(self, "virtual_host_group")
- self.queue = ModelClass(self, "queue")
- self.consumer = ModelClass(self, "consumer")
- self.exchange = ModelClass(self, "exchange")
- self.producer = ModelClass(self, "producer")
- self.client = ModelClass(self, "client")
- self.session = ModelClass(self, "session")
- self.realm = ModelClass(self, "realm")
- self.binding = ModelClass(self, "binding")
-
- assoc = ModelAssociation(self, "broker_cluster_to_brokers")
- assoc.add_endpoint(self.broker, "broker_cluster", "0..1")
- assoc.add_endpoint(self.broker_cluster, "broker", "0..n")
-
- assoc = ModelAssociation(self, "broker_profile_to_brokers")
- assoc.add_endpoint(self.broker, "broker_profile", "0..1")
- assoc.add_endpoint(self.broker_profile, "broker", "0..n")
-
- assoc = ModelAssociation(self, "broker_profile_to_config_properties")
- assoc.add_endpoint(self.config_property, "broker_profile", "0..1")
- assoc.add_endpoint(self.broker_profile, "config_property", "0..n")
-
- assoc = ModelAssociation(self, "broker_cluster_to_virtual_hosts")
- assoc.add_endpoint(self.virtual_host, "broker_cluster", "0..1")
- assoc.add_endpoint(self.broker_cluster, "virtual_host", "0..n")
-
- assoc = ModelAssociation(self, "broker_to_config_properties")
- assoc.add_endpoint(self.config_property, "broker", "0..1")
- assoc.add_endpoint(self.broker, "config_property", "0..n")
-
- assoc = ModelAssociation(self, "broker_to_virtual_hosts")
- assoc.add_endpoint(self.virtual_host, "broker", "0..1")
- assoc.add_endpoint(self.broker, "virtual_host", "0..n")
-
- assoc = ModelAssociation(self, "broker_groups_to_brokers")
- assoc.add_endpoint(self.broker, "broker_group", "0..n")
- assoc.add_endpoint(self.broker_group, "broker", "0..n")
-
- assoc = ModelAssociation(self, "broker_groups_to_broker_group_type")
- assoc.add_endpoint(self.broker_group_type, "broker_group", "0..n")
- assoc.add_endpoint(self.broker_group, "type", "0..1")
-
- assoc = ModelAssociation(self, "broker_groups_to_broker_groups")
- assoc.add_endpoint(self.broker_group, "parent", "0..n")
- assoc.add_endpoint(self.broker_group, "child", "0..n")
-
- assoc = ModelAssociation(self, "virtual_host_groups_to_virtual_hosts")
- assoc.add_endpoint(self.virtual_host, "virtual_host_group", "0..n")
- assoc.add_endpoint(self.virtual_host_group, "virtual_host", "0..n")
-
- assoc = ModelAssociation \
- (self, "virtual_host_groups_to_virtual_host_groups")
- assoc.add_endpoint(self.virtual_host_group, "parent", "0..n")
- assoc.add_endpoint(self.virtual_host_group, "child", "0..n")
-
- assoc = ModelAssociation(self, "virtual_host_to_queues")
- assoc.add_endpoint(self.virtual_host, "queue", "0..n")
- assoc.add_endpoint(self.queue, "virtual_host", "0..1")
-
- assoc = ModelAssociation(self, "queue_to_consumers")
- assoc.add_endpoint(self.queue, "consumer", "0..n")
- assoc.add_endpoint(self.consumer, "queue", "0..1")
-
- assoc = ModelAssociation(self, "virtual_host_to_exchanges")
- assoc.add_endpoint(self.virtual_host, "exchange", "0..n")
- assoc.add_endpoint(self.exchange, "virtual_host", "0..1")
-
- assoc = ModelAssociation(self, "exchange_to_producers")
- assoc.add_endpoint(self.exchange, "producer", "0..n")
- assoc.add_endpoint(self.producer, "exchange", "0..1")
-
- assoc = ModelAssociation(self, "virtual_host_to_clients")
- assoc.add_endpoint(self.virtual_host, "client", "0..n")
- assoc.add_endpoint(self.client, "virtual_host", "0..1")
-
- assoc = ModelAssociation(self, "client_to_sessions")
- assoc.add_endpoint(self.client, "session", "0..n")
- assoc.add_endpoint(self.session, "client", "0..1")
-
- assoc = ModelAssociation(self, "virtual_host_to_realms")
- assoc.add_endpoint(self.virtual_host, "realm", "0..n")
- assoc.add_endpoint(self.realm, "virtual_host", "0..1")
-
- assoc = ModelAssociation(self, "realms_to_queues")
- assoc.add_endpoint(self.realm, "queue", "0..n")
- assoc.add_endpoint(self.queue, "realm", "0..n")
-
- assoc = ModelAssociation(self, "realms_to_exchanges")
- assoc.add_endpoint(self.realm, "exchange", "0..n")
- assoc.add_endpoint(self.exchange, "realm", "0..n")
-
- assoc = ModelAssociation(self, "queue_to_bindings")
- assoc.add_endpoint(self.queue, "binding", "0..n")
- assoc.add_endpoint(self.binding, "queue", "0..1")
-
- assoc = ModelAssociation(self, "exchange_to_bindings")
- assoc.add_endpoint(self.exchange, "binding", "0..n")
- assoc.add_endpoint(self.binding, "exchange", "0..1")
-
- def get_broker_cluster(self, id):
- return self.get_index(self.broker_cluster).get(id)
-
- def get_broker_clusters(self):
- return self.get_index(self.broker_cluster).values()
-
- def get_broker(self, id):
- return self.get_index(self.broker).get(id)
-
- def get_brokers(self):
- return self.get_index(self.broker).values()
-
- def get_broker_profile(self, id):
- return self.get_index(self.broker_profile).get(id)
-
- def get_broker_profiles(self):
- return self.get_index(self.broker_profile).values()
-
- def get_broker_group(self, id):
- return self.get_index(self.broker_group).get(id)
-
- def get_broker_groups(self):
- return self.get_index(self.broker_group).values()
-
- def get_broker_group_type(self, id):
- return self.get_index(self.broker_group_type).get(id)
-
- def get_broker_group_types(self):
- return self.get_index(self.broker_group_type).values()
-
- def get_config_property(self, id):
- return self.get_index(self.config_property).get(id)
-
- def get_virtual_host(self, id):
- return self.get_index(self.virtual_host).get(id)
-
- def get_virtual_hosts(self):
- return self.get_index(self.virtual_host).values()
-
- def get_virtual_host_templates(self):
- return [i for i in self.get_virtual_hosts() \
- if not i.get_cluster() and not i.get_broker_cluster()]
-
- def get_virtual_host_group(self, id):
- return self.get_index(self.virtual_host_group).get(id)
-
- def get_virtual_host_groups(self):
- return self.get_index(self.virtual_host_group).values()
-
- def get_queue(self, id):
- return self.get_index(self.queue).get(id)
-
- def get_exchange(self, id):
- return self.get_index(self.exchange).get(id)
-
- def get_client(self, id):
- return self.get_index(self.client).get(id)
-
- def get_session(self, id):
- return self.get_index(self.session).get(id)
-
- def get_realm(self, id):
- return self.get_index(self.realm).get(id)
-
- def brokers(self):
- return list(mint.Broker.select())
-
-class DummyModelObject(ModelObject):
- def __init__(self, model, mclass):
- super(DummyModelObject, self).__init__(model, mclass)
-
- self.errors = list()
- self.warnings = list()
- self.measurements = list()
-
- def get_measurement(self, name):
- for measure in self.measurements:
- if measure.name == name:
- return measure
-
- def write_error_xml(self, writer):
- writer.write("<error-count>%i</error-count>" % len(self.errors))
- writer.write("<warning-count>%i</warning-count>" % len(self.warnings))
-
- def write_measurement_xml(self, writer):
- for measure in self.measurements:
- measure.write_xml(writer)
-
-class Broker(DummyModelObject):
- def __init__(self, model):
- super(Broker, self).__init__(model, model.broker)
-
- self.name = None
- self.default_virtual_host = None
-
- def write_xml(self, writer):
- writer.write("<broker id=\"broker-%i\">" % self.id)
- writer.write("<name>" + self.name + "</name>")
- writer.write("<default-virtual-host ref=\"virtual-host-%i\"/>" \
- % self.default_virtual_host.id)
-
- self.write_error_xml(writer)
-
- for vhost in self.virtual_host_items():
- vhost.write_xml(writer)
-
- writer.write("</broker>")
-
-class BrokerProfile(DummyModelObject):
- def __init__(self, model):
- super(BrokerProfile, self).__init__(model, model.broker_profile)
-
- self.name = None
-
-class ConfigProperty(ModelObject):
- def __init__(self, model):
- super(ConfigProperty, self).__init__(model, model.config_property)
-
- self.name = None
- self.value = None
- self.broker_value = None
- self.type = None # ("boolean", "integer", "string")
-
-class BrokerGroup(DummyModelObject):
- def __init__(self, model):
- super(BrokerGroup, self).__init__(model, model.broker_group)
-
- self.name = None
-
-class BrokerGroupType(ModelObject):
- def __init__(self, model):
- super(BrokerGroupType, self).__init__(model, model.broker_group_type)
-
- self.name = None
-
-class VirtualHost(DummyModelObject):
- def __init__(self, model):
- super(VirtualHost, self).__init__(model, model.virtual_host)
-
- self.name = None
-
- # XXX do this via associations? XXX this will leak a ref if
- # the default exchange is removed
-
- self.default_exchange = Exchange(model)
- self.default_exchange.name = "default"
- self.add_exchange(self.default_exchange)
-
- def add_queue(self, queue):
- self.do_add_queue(queue)
-
- # Default binding
-
- binding = Binding(self.model)
- binding.binding_key = queue.name
- binding.set_queue(queue)
- binding.set_exchange(self.default_exchange)
-
- def write_xml(self, writer):
- writer.write("<virtual-host id=\"virtual-host-%i\">" % self.id)
- writer.write("<name>%s</name>" % self.name)
- writer.write("<default-exchange ref=\"exchange-%i\"/>" \
- % self.default_exchange.id)
-
- self.write_error_xml(writer)
-
- for queue in self.queue_items():
- queue.write_xml(writer)
-
- for exchange in self.exchange_items():
- exchange.write_xml(writer)
-
- for realm in self.realm_items():
- realm.write_xml(writer)
-
- writer.write("</virtual-host>")
-
-class VirtualHostGroup(ModelObject):
- def __init__(self, model):
- super(VirtualHostGroup, self).__init__(model, model.virtual_host_group)
-
- self.name = None
-
-class Realm(DummyModelObject):
- def __init__(self, model):
- super(Realm, self).__init__(model, model.realm)
-
- self.name = None
-
- def write_xml(self, writer):
- writer.write("<realm id=\"realm-%i\">" % self.id)
- writer.write("<name>%s</name>" % self.name)
-
- self.write_error_xml(writer)
-
- for queue in self.queue_items():
- writer.write("<queue ref=\"queue-%i\"/>" % queue.id)
-
- for exchange in self.exchange_items():
- writer.write("<exchange ref=\"exchange-%i\"/>" % exchange.id)
-
- writer.write("</realm>")
-
-class Measurement(object):
- def __init__(self, name, type, class_=None):
- self.name = name
- self.type = type
- self.categories = ()
- self.title = None
- self.unit = None
- self.__value = None
- self.__values = list()
- self.class_ = class_
- self.link_cb = None
-
- self.highlow = False
- self.__high = None
- self.__low = None
-
- if type == "int":
- self.add_value(0)
-
- def add_value(self, value):
- if value == None:
- raise Exception()
-
- self.__value = value
- self.__values.append(value)
-
- if len(self.__values) > 1000:
- del self.__values[0]
-
- if self.highlow:
- if self.__high == None or self.__low == None:
- self.__high = value
- self.__low = value
- else:
- if self.__high < value:
- self.__high = value
-
- if self.__low > value:
- self.__low = value
-
- def get_value(self):
- return self.__value
-
- # Get recent values, with latest value at index 0
- def get_values(self, limit=100):
- values = self.__values[-limit:]
- values.reverse()
-
- # Pad the values if there are too few
- if len(values) < limit:
- for i in range(len(values), limit):
- values.append(0)
-
- return values
-
- def get_rate(self, interval=1):
- curr, prev = self.get_values(2)
- return (curr - prev) / float(interval)
-
- def get_high(self):
- return self.__high
-
- def get_low(self):
- return self.__low
-
- def write_xml(self, writer):
- hl = ""
-
- if self.highlow:
- hl = "high=\"%i\" low=\"%i\"" % (self.get_high(), self.get_low())
-
- writer.write("<measurement name=\"%s\" value=\"%i\" rate=\"%i\" %s/>" \
- % (self.name, self.get_value(), self.get_rate(), hl))
-
-class Queue(DummyModelObject):
- def __init__(self, model):
- super(Queue, self).__init__(model, model.queue)
-
- self.name = None
- self.is_passive = False
- self.is_durable = True
- self.is_exclusive = False
- self.is_auto_delete = False
- self.latency_priority = "m" # h, m, or l
-
- # General
-
- measure = Measurement("consumers", "int")
- measure.title = "Consumers"
- measure.unit = "consumer"
- measure.categories = ("general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("bindings", "int")
- measure.title = "Bindings"
- measure.unit = "binding"
- measure.categories = ("general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("msgDepth", "int")
- measure.title = "Message Depth"
- measure.unit = "message"
- measure.categories = ("message", "general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("msgTotalEnqueues", "int")
- measure.title = "Msgs. Enqueued"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("msgTotalDequeues", "int")
- measure.title = "Msgs. Dequeued"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("byteDepth", "int")
- measure.title = "Byte Depth"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("byteTotalEnqueues", "int")
- measure.title = "Bytes Enqueued"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("byteTotalDequeues", "int")
- measure.title = "Bytes Dequeued"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("unackedMessages", "int")
- measure.title = "Msgs. Unacked"
- measure.unit = "message"
- measure.categories = ("general")
- self.measurements.append(measure)
-
- # Disk
-
- #measure = Measurement("diskPageSize", "int")
- #measure.title = "Page size"
- #measure.categories = ("disk")
- #self.measurements.append(measure)
-
- measure = Measurement("diskPages", "int")
- measure.title = "Disk Pages"
- measure.unit = "page"
- measure.categories = ("general")
- self.measurements.append(measure)
-
- #measure = Measurement("diskAvailableSize", "int")
- #measure.title = "Available size"
- #measure.categories = ("disk")
- #self.measurements.append(measure)
-
- # Transactional
-
- measure = Measurement("msgTxEnqueues", "int")
- measure.title = "Msgs. Enqueued"
- measure.unit = "message"
- measure.categories = ("message", "transactional")
- self.measurements.append(measure)
-
- measure = Measurement("msgTxDequeues", "int")
- measure.title = "Msgs. Dequeued"
- measure.unit = "message"
- measure.categories = ("message", "transactional")
- self.measurements.append(measure)
-
- measure = Measurement("byteTxEnqueues", "int")
- measure.title = "Bytes Enqueued"
- measure.unit = "byte"
- measure.categories = ("byte", "transactional")
- self.measurements.append(measure)
-
- measure = Measurement("byteTxDequeues", "int")
- measure.title = "Bytes Dequeued"
- measure.unit = "byte"
- measure.categories = ("byte", "transactional")
- self.measurements.append(measure)
-
- measure = Measurement("enqueueTxStarts", "int")
- measure.title = "Enq. Trans. Started"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("enqueueTxCommits", "int")
- measure.title = "Enq. Trans. Committed"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("enqueueTxRejects", "int")
- measure.title = "Enq. Trans. Rejected"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("enqueueTxCount", "int")
- measure.title = "Enq. Trans. Pending"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("dequeueTxStarts", "int")
- measure.title = "Deq. Trans. Started"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("dequeueTxCommits", "int")
- measure.title = "Deq. Trans. Committed"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("dequeueTxRejects", "int")
- measure.title = "Deq. Trans. Rejected"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- self.measurements.append(measure)
-
- measure = Measurement("dequeueTxCount", "int")
- measure.title = "Deq. Trans. Pending"
- measure.unit = "transaction"
- measure.categories = ("transaction")
- measure.highlow = True
- self.measurements.append(measure)
-
- # Persistent
-
- measure = Measurement("msgPersistEnqueues", "int")
- measure.title = "Msgs. Enqueued"
- measure.unit = "message"
- measure.categories = ("message", "persistent")
- self.measurements.append(measure)
-
- measure = Measurement("msgPersistDequeues", "int")
- measure.title = "Msgs. Dequeued"
- measure.unit = "message"
- measure.categories = ("message", "persistent")
- self.measurements.append(measure)
-
- measure = Measurement("bytePersistEnqueues", "int")
- measure.title = "Bytes Enqueued"
- measure.unit = "byte"
- measure.categories = ("byte", "persistent")
- self.measurements.append(measure)
-
- measure = Measurement("bytePersistDequeues", "int")
- measure.title = "Bytes Dequeued"
- measure.unit = "byte"
- measure.categories = ("byte", "persistent")
- self.measurements.append(measure)
-
- def remove(self):
- for binding in self.binding_items().copy():
- binding.remove()
-
- super(Queue, self).remove()
-
- def purge(self):
- pass
-
- def write_xml(self, writer):
- writer.write("<queue id=\"queue-%i\">" % self.id)
- writer.write("<name>%s</name>" % self.name)
-
- self.write_error_xml(writer)
- self.write_measurement_xml(writer)
-
- writer.write("</queue>")
-
-class Consumer(DummyModelObject):
- def __init__(self, model):
- super(Consumer, self).__init__(model, model.consumer)
-
- self.name = None
-
- measure = Measurement("msgsConsumed", "int")
- measure.title = "Msgs. Consumed"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("bytesConsumed", "int")
- measure.title = "Bytes Consumed"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("unackedMessages", "int")
- measure.title = "Msgs. Unacked"
- measure.unit = "message"
- measure.categories = ("message", "general")
- measure.highlow = True
- self.measurements.append(measure)
-
-class Exchange(DummyModelObject):
- def __init__(self, model):
- super(Exchange, self).__init__(model, model.exchange)
-
- self.name = None
- self.type = "direct" # in ("direct", "topic", "fanout")
- self.is_passive = False
- self.is_durable = True
- self.is_auto_delete = False
- self.is_internal = False
-
- measure = Measurement("producers", "int")
- measure.title = "Producers"
- measure.unit = "producer"
- measure.categories = ("general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("bindings", "int")
- measure.title = "Bindings"
- measure.unit = "binding"
- measure.categories = ("general")
- measure.highlow = True
- self.measurements.append(measure)
-
- measure = Measurement("msgReceives", "int")
- measure.title = "Msgs. Received"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("msgDrops", "int")
- measure.title = "Msgs. Dropped"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("msgRoutes", "int")
- measure.title = "Msgs. Routed"
- measure.unit = "message"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("byteReceives", "int")
- measure.title = "Bytes Received"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("byteDrops", "int")
- measure.title = "Bytes Dropped"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("byteRoutes", "int")
- measure.title = "Bytes Routed"
- measure.unit = "byte"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- def remove(self):
- for binding in self.binding_items().copy():
- binding.remove()
-
- super(Exchange, self).remove()
-
- def write_xml(self, writer):
- writer.write("<exchange id=\"exchange-%i\">" % self.id)
- writer.write("<name>%s</name>" % self.name)
-
- self.write_error_xml(writer)
- self.write_measurement_xml(writer)
-
- writer.write("</exchange>")
-
-class Producer(DummyModelObject):
- def __init__(self, model):
- super(Producer, self).__init__(model, model.producer)
-
- self.name = None
-
- measure = Measurement("msgsProduced", "int")
- measure.title = "Msgs. Produced"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("bytesProduced", "int")
- measure.title = "Bytes Produced"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
-class Binding(DummyModelObject):
- def __init__(self, model):
- super(Binding, self).__init__(model, model.binding)
-
- self.binding_key = None
-
- measure = Measurement("msgMatched", "int")
- measure.title = "Msgs. Matched"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- def write_xml(self, writer):
- writer.write("<binding id=\"binding-%i\">" % self.id)
- writer.write("<exchange ref=\"exchange-%i\"/>" % self.exchange.id)
- writer.write("<queue ref=\"queue-%i\"/>" % self.queue.id)
- writer.write("<binding-key>%s</binding-key>" % self.binding_key)
-
- self.write_error_xml(writer)
- self.write_measurement_xml(writer)
-
- writer.write("</binding>")
-
-class Client(DummyModelObject):
- def __init__(self, model):
- super(Client, self).__init__(model, model.client)
-
- self.address = None
-
- measure = Measurement("msgsProduced", "int")
- measure.title = "Msgs. Produced"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("msgsConsumed", "int")
- measure.title = "Msgs. Consumed"
- measure.categories = ("message", "general")
- self.measurements.append(measure)
-
- measure = Measurement("bytesProduced", "int")
- measure.title = "Bytes Produced"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- measure = Measurement("bytesConsumed", "int")
- measure.title = "Bytes Consumed"
- measure.categories = ("byte", "general")
- self.measurements.append(measure)
-
- def write_xml(self, writer):
- writer.write("<client id=\"client-%i\">" % self.id)
- writer.write("<address>%s</address>" % self.address)
-
- self.write_error_xml(writer)
- self.write_measurement_xml(writer)
-
- writer.write("</client>")
-
-class Session(DummyModelObject):
- def __init__(self, model):
- super(Session, self).__init__(model, model.session)
-
- self.name = None
-
- measure = Measurement("attached", "bool")
- measure.title = "Attached"
- measure.categories = ("general")
- self.measurements.append(measure)
-
- measure = Measurement("remainingLifespan", "int")
- measure.title = "Remaining lifespan"
- measure.categories = ("general")
- self.measurements.append(measure)
-
- measure = Measurement("framesOutstanding", "int")
- measure.title = "Frames outstanding"
- measure.categories = ("general")
- self.measurements.append(measure)
Modified: mgmt/cumin/python/cumin/parameters.py
===================================================================
--- mgmt/cumin/python/cumin/parameters.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/parameters.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -38,7 +38,7 @@
class ConfigPropertyParameter(Parameter):
def do_unmarshal(self, string):
- return self.app.model.get_config_property(int(string))
+ return ConfigProperty.get(int(string))
def do_marshal(self, prop):
return str(prop.id)
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/queue.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -1,3 +1,4 @@
+from mint import *
from wooly import *
from wooly.widgets import *
from wooly.forms import *
@@ -58,23 +59,23 @@
def render_item_enqueued(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteTotalEnqueues" or "msgTotalEnqueues"
- value = self.app.cmodel.queue.get_stat(key).rate(queue)
+ value = self.app.model.queue.get_stat(key).rate(queue)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_dequeued(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteTotalDequeues" or "msgTotalDequeues"
- value = self.app.cmodel.queue.get_stat(key).rate(queue)
+ value = self.app.model.queue.get_stat(key).rate(queue)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_depth(self, session, queue):
key = self.unit.get(session) == "b" and "byteDepth" or "msgDepth"
- return self.app.cmodel.queue.get_stat(key).value(queue)
+ return self.app.model.queue.get_stat(key).value(queue)
def render_item_depth_accel(self, session, queue):
unit = self.unit.get(session)
key = unit == "b" and "byteDepth" or "msgDepth"
- value = self.app.cmodel.queue.get_stat(key).rate(queue)
+ value = self.app.model.queue.get_stat(key).rate(queue)
return fmt_rate(value, unit == "b" and "byte" or "msg", "sec")
def render_item_status(self, session, queue):
@@ -118,36 +119,36 @@
class QueueStatus(CuminStatus):
def render_consumers(self, session, queue):
- return self.app.cmodel.queue.get_stat("consumers").value(queue)
+ return self.app.model.queue.get_stat("consumers").value(queue)
def render_messages_enqueued(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("msgTotalEnqueues")
+ stat = self.app.model.queue.get_stat("msgTotalEnqueues")
return fmt_rate(stat.rate(queue), "msg", "sec")
def render_messages_dequeued(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("msgTotalDequeues")
+ stat = self.app.model.queue.get_stat("msgTotalDequeues")
return fmt_rate(stat.rate(queue), "msg", "sec")
def render_message_depth(self, session, queue):
- return self.app.cmodel.queue.get_stat("msgDepth").value(queue)
+ return self.app.model.queue.get_stat("msgDepth").value(queue)
def render_message_depth_accel(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("msgDepth")
+ stat = self.app.model.queue.get_stat("msgDepth")
return fmt_rate(stat.rate(queue), "msg", "sec")
def render_bytes_enqueued(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("byteTotalEnqueues")
+ stat = self.app.model.queue.get_stat("byteTotalEnqueues")
return fmt_rate(stat.rate(queue), "byte", "sec")
def render_bytes_dequeued(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("byteTotalDequeues")
+ stat = self.app.model.queue.get_stat("byteTotalDequeues")
return fmt_rate(stat.rate(queue), "byte", "sec")
def render_byte_depth(self, session, queue):
- return self.app.cmodel.queue.get_stat("byteDepth").value(queue)
+ return self.app.model.queue.get_stat("byteDepth").value(queue)
def render_byte_depth_accel(self, session, queue):
- stat = self.app.cmodel.queue.get_stat("byteDepth")
+ stat = self.app.model.queue.get_stat("byteDepth")
return fmt_rate(stat.rate(queue), "byte", "sec")
class QueueView(Widget):
@@ -271,21 +272,15 @@
class QueueAdd(QueueForm):
def process_cancel(self, session, vhost):
branch = session.branch()
- self.page().show_broker(branch, vhost.get_broker()).show_view(branch)
+ self.page().show_broker(branch, vhost.broker).show_view(branch)
self.page().set_redirect_url(session, branch.marshal())
def process_submit(self, session, vhost):
if self.validate(session):
- queue = Queue(self.app.model)
+ queue = Queue()
+ queue.name = self.queue_name.get(session)
- queue.lock()
- try:
- queue.name = self.queue_name.get(session)
- queue.latency_priority = self.latency_priority.get(session)
- finally:
- queue.unlock()
-
- vhost.add_queue(queue)
+ vhost.addQueue(queue)
branch = session.branch()
self.page().show_queue(branch, queue).show_view(branch)
@@ -359,7 +354,7 @@
def process_submit(self, session, queue):
print "open purge"
- queue.mintVhost.mintBroker.echo(self.app.mint, doit, 1, "dude!")
+ queue.vhost.broker.echo(self.app.model.data, doit, 1, "dude!")
print "close purge"
@@ -408,16 +403,14 @@
def process_submit(self, session, queue):
if self.validate(session):
- binding = Binding(self.app.model)
+ binding = Binding()
- binding.lock()
- try:
- binding.binding_key = self.binding_key.get(session)
- binding.set_queue(queue)
- binding.set_exchange(self.exchanges.get(session))
- finally:
- binding.unlock()
+ binding.binding_key = self.binding_key.get(session)
+ # XXX uh huh
+ binding.set_queue(queue)
+ binding.set_exchange(self.exchanges.get(session))
+
self.process_cancel(session, queue)
class Exchanges(ExchangeInputSet):
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-12-03 17:08:41 UTC (rev 1416)
+++ mgmt/cumin/python/cumin/widgets.py 2007-12-03 19:11:22 UTC (rev 1417)
@@ -174,7 +174,7 @@
def do_render(self, session, object):
chart = LineChart(600, 120)
- cls = self.app.cmodel.get_class(object)
+ cls = self.app.model.get_class(object)
stats = [cls.get_stat(x) for x in self.stats.get(session)]
samples = stats[0].samples(object, 121)
@@ -227,7 +227,7 @@
writer.write("<objects>");
for object in objects:
- cls = self.app.cmodel.get_class(object)
+ cls = self.app.model.get_class(object)
cls.write_xml(object, writer)
writer.write("</objects>");
More information about the rhmessaging-commits
mailing list