rhmessaging commits: r2759 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: gordonsim
Date: 2008-11-06 12:30:20 -0500 (Thu, 06 Nov 2008)
New Revision: 2759
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Fixed typos
Altered option name to avoid auto-expand being a substring of auto-expand-max-jfiles as this causes
ambiguous option error when trying to set on platforms with boost 1.33
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-11-06 16:06:16 UTC (rev 2758)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-11-06 17:30:20 UTC (rev 2759)
@@ -328,11 +328,11 @@
QPID_LOG(info, "> Default files per journal: " << jfiles);
QPID_LOG(info, "> Auto-expand " << (autoJrnlExpand ? "enabled" : "disabled"));
if (autoJrnlExpand) QPID_LOG(info, "> Max auto-expand journal files: " << autoJrnlExpandMaxFiles);
- QPID_LOG(info, "> Default jrournal file size: " << jfileSizePgs << " (wpgs)");
+ QPID_LOG(info, "> Default journal file size: " << jfileSizePgs << " (wpgs)");
QPID_LOG(info, "> Default write cache page size: " << wCachePageSizeKib << " (Kib)");
QPID_LOG(info, "> Default number of write cache pages: " << wCacheNumPages);
QPID_LOG(info, "> TPL files per journal: " << tplNumJrnlFiles);
- QPID_LOG(info, "> TPL jrournal file size: " << tplJfileSizePgs << " (wpgs)");
+ QPID_LOG(info, "> TPL journal file size: " << tplJfileSizePgs << " (wpgs)");
QPID_LOG(info, "> TPL write cache page size: " << tplWCachePageSizeKib << " (Kib)");
QPID_LOG(info, "> TPL number of write cache pages: " << tplWCacheNumPages);
return true;
@@ -1762,7 +1762,7 @@
("auto-expand", qpid::optValue(autoJrnlExpand, "yes|no"),
"If yes|true|1, allows journal to auto-expand by adding additional journal files as needed. "
"If no|false|0, the number of journal files will remain fixed (num-jfiles).")
- ("auto-expand-max-jfiles", qpid::optValue(autoJrnlExpandMaxFiles, "N"),
+ ("max-auto-expand-jfiles", qpid::optValue(autoJrnlExpandMaxFiles, "N"),
"Maximum number of journal files allowed from auto-expanding; must be greater than --num-jfiles parameter.")
("jfile-size-pgs", qpid::optValue(jrnlFsizePgs, "N"),
"Default size for each journal file in multiples of read pages (1 read page = 64kiB)")
15 years, 7 months
rhmessaging commits: r2758 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 11:06:16 -0500 (Thu, 06 Nov 2008)
New Revision: 2758
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Fix bug in ajax call that updated the scheduler and collector status box.
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-11-06 16:04:46 UTC (rev 2757)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-11-06 16:06:16 UTC (rev 2758)
@@ -2354,7 +2354,7 @@
job.SetAttribute(self.model.data, completion, Name, str(Value))
class GetStartedAction(CuminAction):
- def do_invoke(self, object):
+ def get_xml_response(self, session, object, *args):
confidence = self.started_confidence(object)
recTime = object.statsCurr and object.statsCurr.recTime or object.recTime
conf = "<confidence>%d</confidence>" % confidence
@@ -2614,7 +2614,7 @@
return "Stop"
class GetLimitCount(CuminAction):
- def get_xml_response(self, session, negotiator):
+ def get_xml_response(self, session, negotiator, *args):
action = self.model.negotiator.GetLimits
limits = action.do_invoke(negotiator)
error = "False"
15 years, 7 months
rhmessaging commits: r2757 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 11:04:46 -0500 (Thu, 06 Nov 2008)
New Revision: 2757
Modified:
mgmt/trunk/cumin/python/cumin/charts.py
Log:
Prevent stats line graph from drawing past right side of grid
Modified: mgmt/trunk/cumin/python/cumin/charts.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/charts.py 2008-11-06 15:52:38 UTC (rev 2756)
+++ mgmt/trunk/cumin/python/cumin/charts.py 2008-11-06 16:04:46 UTC (rev 2757)
@@ -33,7 +33,10 @@
value = 0
t = secs(dt)
-
+ # prevent line from drawing off right side of grid
+ if tnow - t < 0:
+ t = tnow
+
x = self.width - ((tnow - t) / float(self.x_max)) * self.width
y = self.height - (value / float(self.y_max)) * self.height
cr.line_to(x, y)
15 years, 7 months
rhmessaging commits: r2756 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-11-06 10:52:38 -0500 (Thu, 06 Nov 2008)
New Revision: 2756
Modified:
mgmt/trunk/cumin/python/cumin/pool.py
mgmt/trunk/cumin/python/cumin/pool.strings
Log:
Fix the pool count
Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py 2008-11-06 14:41:39 UTC (rev 2755)
+++ mgmt/trunk/cumin/python/cumin/pool.py 2008-11-06 15:52:38 UTC (rev 2756)
@@ -37,7 +37,8 @@
self.add_column(col)
def render_title(self, session):
- return "Pools %s" % fmt_count(CollectorRegistration.select().count())
+ count = self.get_item_count(session)
+ return "Pools %s" % fmt_count(count)
class NameColumn(SqlTableColumn):
def render_title(self, session, data):
Modified: mgmt/trunk/cumin/python/cumin/pool.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.strings 2008-11-06 14:41:39 UTC (rev 2755)
+++ mgmt/trunk/cumin/python/cumin/pool.strings 2008-11-06 15:52:38 UTC (rev 2756)
@@ -12,7 +12,9 @@
on j.pool = p.pool
[PoolSet.count_sql]
-select count(*) from collector
+select count(*)
+from
+ (select 1 from collector group by pool) as l
[PoolStatus.html]
<div id="{id}" class="CuminStatus {color}">
15 years, 7 months
rhmessaging commits: r2755 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 09:41:39 -0500 (Thu, 06 Nov 2008)
New Revision: 2755
Modified:
mgmt/trunk/cumin/python/cumin/job.py
Log:
Shorten Job Command column and show 5 characters from the start and 11 from the end.
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-11-06 14:13:38 UTC (rev 2754)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-11-06 14:41:39 UTC (rev 2755)
@@ -188,6 +188,9 @@
class CommandColumn(ItemTableColumn):
def render_title(self, session, data):
return "Command"
+
+ def render_content(self, session, data):
+ return fmt_shorten(data[self.name], pre=5, post=11)
class TitleColumn(SqlTableColumn):
def render_title(self, session, data):
15 years, 7 months
rhmessaging commits: r2754 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 09:13:38 -0500 (Thu, 06 Nov 2008)
New Revision: 2754
Modified:
mgmt/trunk/cumin/python/cumin/broker.py
mgmt/trunk/cumin/python/cumin/broker.strings
Log:
Removing after Unregister button.
Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py 2008-11-06 14:12:00 UTC (rev 2753)
+++ mgmt/trunk/cumin/python/cumin/broker.py 2008-11-06 14:13:38 UTC (rev 2754)
@@ -48,6 +48,9 @@
def render_content(self, session):
return "Unregister"
+ def render_class(self, session):
+ return "unregister"
+
def process_submit(self, session):
ids = self.parent.ids.get(session)
self.parent.ids.clear(session)
Modified: mgmt/trunk/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.strings 2008-11-06 14:12:00 UTC (rev 2753)
+++ mgmt/trunk/cumin/python/cumin/broker.strings 2008-11-06 14:13:38 UTC (rev 2754)
@@ -10,6 +10,11 @@
from broker_registration as br
{sql_where}
+[BrokerSet.css]
+div.sactions button.unregister {
+ margin-right: 2em;
+}
+
[BrokerSet.html]
<form id="{id}" method="post" action="?">
<!-- <select onchange="document.getElementById('{id}.submit').submit()"> -->
@@ -18,8 +23,6 @@
<h2>Act on Selection:</h2>
{unregister}
-
-
<h2>Add to Group:</h2>
{groups} {groupify}
</div>
15 years, 7 months
rhmessaging commits: r2753 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 09:12:00 -0500 (Thu, 06 Nov 2008)
New Revision: 2753
Modified:
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/brokerlink.strings
Log:
Fixups to work with API change.
Use new MoreFieldSet for Show/Hide advanced options on BridgeAdd form.
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-06 14:10:07 UTC (rev 2752)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-06 14:12:00 UTC (rev 2753)
@@ -72,10 +72,9 @@
def render_content(self, session, data):
peer = Identifiable(data["id"])
- branch = session.branch()
- self.frame.link.view.show(branch)
+ href = self.frame.link.get_href(session, peer)
name = "%s:%i" % (data["host"], data["port"])
- return fmt_olink(branch, peer, name=name)
+ return fmt_link(href, fmt_shorten(name))
def get_orderby_sql(self, session):
dir = self.parent.is_reversed(session) and "desc" or "asc"
@@ -384,7 +383,7 @@
not (self.state.is_active(session) and not is_active(exchange)):
if not exchange.name in ["qpid.management", ""]:
if not self.get(session):
- self.exchange.set(session, str(exchange.id))
+ self.set(session, str(exchange.id))
self.exchange_tmpl.render(writer, session, exchange)
return writer.to_string()
@@ -406,40 +405,25 @@
self.key.set_title("Routing Key")
self.add_field(self.key)
+ self.more = MoreFieldSet(app, "more")
+ self.add_field(self.more)
+
+ self.help = self.BridgeAddHelpField(app, "help")
+ self.more.add_field(self.help)
+
self.tag = TextField(app, "tag")
self.tag.set_required(False)
self.tag.set_title("Tag")
- self.add_field(self.tag)
+ self.more.add_field(self.tag)
self.excludes = TextField(app, "excludes")
self.excludes.set_required(False)
self.excludes.set_title("Excludes")
- self.add_field(self.excludes)
+ self.more.add_field(self.excludes)
- self.tag_excludes = list()
- self.tag_excludes.append(self.tag)
- self.tag_excludes.append(self.excludes)
-
def get_args(self, session):
return self.frame.get_args(session)
- def render_fields(self, session, *args):
- writer = Writer()
-
- for field in self.fields:
- if not field in self.tag_excludes:
- writer.write(field.render(session))
-
- return writer.to_string()
-
- def render_hidden_fields(self, session, *args):
- writer = Writer()
-
- for field in self.tag_excludes:
- writer.write(field.render(session))
-
- return writer.to_string()
-
def render_title(self, session, link):
return "Add Route to '%s:%d'" % (link.host, link.port)
@@ -484,6 +468,9 @@
self.process_cancel(session, link)
+ class BridgeAddHelpField(FormField):
+ pass
+
class BrokerLinkAdd(CuminFieldForm):
def __init__(self, app, name):
super(BrokerLinkAdd, self).__init__(app, name)
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.strings 2008-11-06 14:10:07 UTC (rev 2752)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.strings 2008-11-06 14:12:00 UTC (rev 2753)
@@ -228,92 +228,31 @@
[PeerRouteSetClose.item_html]
<tr>{item_content}</tr>
-[BridgeAdd.css]
-div#BridgeAdd div#more_button {
- border:1px solid #333333;
- background-color: #EEEEEE;
- color: #333333;
- cursor: pointer;
- float:left; /* shrink to fit */
- margin: 0 0 1em 2em;
- padding: 4px 8px;
-}
-
-div#BridgeAdd div#hidden_fields {
- margin-left: 2em;
- display: none;
-}
-
-div#BridgeAdd div.clear_left {
- clear:left;
- font-size:0;
- line-height:0;
-}
-
-div#BridgeAdd div.hidden_help {
- color:#333333;
- margin-right:1em;
-}
-div#BridgeAdd span.tag1 {
+[BridgeAddHelpField.css]
+div#bridge_add_help span.tag1 {
color:red;
}
-div#BridgeAdd span.tag2 {
+div#bridge_add_help span.tag2 {
color:green;
}
+div#bridge_add_help p.example {
+ font-size: 0.9em;
+ color: #444444;
+}
-[BridgeAdd.html]
-<div id="BridgeAdd">
-<form id="{id}" class="mform" method="post" action="?">
- <div class="head">{title}</div>
- <div class="body">{fields}</div>
- <div id="more_button">Show More Options...</div>
- <div class="clear_left"><!-- --></div>
- <div id="hidden_fields">
- <div class="hidden_help">
- <p>The <strong>Tag</strong> and <strong>Excludes</strong> are used to prevent a message from routing back
- to the source broker and causing an infinite loop.</p>
- <p>Enter a short <strong>tag</strong> that will be associated with the source exchange.
- Then <strong>exclude</strong> any tags that were used for the destination exchanges.</p>
- <p class="example">
- <em>broker1</em> <==> <em>broker2</em> tag: <span class="tag2">tag2</span> excludes: <span class="tag1">tag1</span><br/>
- <em>broker2</em> <==> <em>broker1</em> tag: <span class="tag1">tag1</span> excludes: <span class="tag2">tag2</span>
- </p>
- </div>
- {hidden_fields}
- </div>
- {form_error}
- <div class="foot">
- {help}
- {submit}
- {cancel}
- </div>
- <div>{hidden_inputs}</div>
-</form>
+[BridgeAddHelpField.html]
+<div id="bridge_add_help">
+ <p>The <strong>Tag</strong> and <strong>Excludes</strong> are used to prevent a message from routing back
+ to the source broker and causing an infinite loop.</p>
+ <p>Enter a short <strong>tag</strong> that will be associated with the source exchange.
+ Then <strong>exclude</strong> any tags that were used for the destination exchanges.</p>
+ <p class="example">
+ <em>broker1</em> <==> <em>broker2</em> tag: <span class="tag2">tag2</span> excludes: <span class="tag1">tag1</span><br/>
+ <em>broker2</em> <==> <em>broker1</em> tag: <span class="tag1">tag1</span> excludes: <span class="tag2">tag2</span>
+ </p>
</div>
-<script type="text/javascript">
-<![CDATA[
- wooly.doc().elembyid("{id}").node.elements[0].focus();
- document.getElementById("more_button").onclick = click_more;
- function click_more() {
- var hfields = document.getElementById("hidden_fields");
- if (hfields) {
- if (hfields.style.display == "block") {
- hfields.style.display = "none";
- this.innerHTML = "Show More Options...";
- document.getElementById("{more_path}").value = "f";
- }
- else {
- hfields.style.display = "block";
- this.innerHTML = "Hide Options";
- document.getElementById("{more_path}").value = "t";
- }
- }
- }
-]]>
-</script>
-
[PeerStatus.html]
<div id="{id}" class="CuminStatus {color}">
<table>
15 years, 7 months
rhmessaging commits: r2752 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-06 09:10:07 -0500 (Thu, 06 Nov 2008)
New Revision: 2752
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Removing left over show_* calls from BrokerLink
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-11-05 21:47:20 UTC (rev 2751)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-11-06 14:10:07 UTC (rev 2752)
@@ -1484,7 +1484,6 @@
class Bridge(CuminAction):
def show(self, session, link):
frame = self.cumin_class.show_object(session, link)
- frame = frame.show_peer(session, link)
return frame.show_bridge_add(session)
def get_title(self, session):
@@ -1510,7 +1509,6 @@
class Close(CuminAction):
def show(self, session, link):
frame = self.cumin_class.show_object(session, link)
- frame = frame.show_peer(session, link)
return frame.show_remove(session)
def get_title(self, session):
15 years, 7 months
rhmessaging commits: r2751 - mgmt/trunk/cumin/bin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-11-05 16:47:20 -0500 (Wed, 05 Nov 2008)
New Revision: 2751
Modified:
mgmt/trunk/cumin/bin/cumin-database-init
Log:
Change condition for create-schema
Modified: mgmt/trunk/cumin/bin/cumin-database-init
===================================================================
--- mgmt/trunk/cumin/bin/cumin-database-init 2008-11-05 21:37:48 UTC (rev 2750)
+++ mgmt/trunk/cumin/bin/cumin-database-init 2008-11-05 21:47:20 UTC (rev 2751)
@@ -11,10 +11,6 @@
su - postgres -c "createuser --superuser cumin 2> /dev/null || :"
su - postgres -c "createdb --owner=cumin cumin 2> /dev/null || :"
-cumin-admin check-schema | grep -e '^OK '
-
-if [[ "$?" == "0" ]]; then
- echo "Not creating schema; it already exists"
-else
+cumin-admin check-schema | grep -e '^OK ' || {
cumin-admin create-schema
-fi
+}
15 years, 7 months
rhmessaging commits: r2750 - mgmt/trunk/cumin/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2008-11-05 16:37:48 -0500 (Wed, 05 Nov 2008)
New Revision: 2750
Modified:
mgmt/trunk/cumin/python/wooly/parameters.py
Log:
Undoing change to the way BoolParameter is marshalled.
Modified: mgmt/trunk/cumin/python/wooly/parameters.py
===================================================================
--- mgmt/trunk/cumin/python/wooly/parameters.py 2008-11-05 21:36:46 UTC (rev 2749)
+++ mgmt/trunk/cumin/python/wooly/parameters.py 2008-11-05 21:37:48 UTC (rev 2750)
@@ -90,7 +90,7 @@
self.default = False
def do_unmarshal(self, string):
- return not string == ""
+ return string == "t"
def do_marshal(self, object):
return object and "t" or "f"
15 years, 7 months