rhmessaging commits: r3425 - store/trunk/cpp/tests/cluster.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-06-05 15:35:41 -0400 (Fri, 05 Jun 2009)
New Revision: 3425
Modified:
store/trunk/cpp/tests/cluster/run_cluster_tests
Log:
minor script fix for cluster tests
Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-06-05 17:17:25 UTC (rev 3424)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-06-05 19:35:41 UTC (rev 3425)
@@ -54,7 +54,7 @@
# QPID_DIR is defined for source tree builds because of the --with-qpid-checkout config parameter
CLUSTER_EXEC=cluster_test
-if test "${QPID_DIR}" -a -d {QPID_DIR} ; then
+if test "${QPID_DIR}" -a -d ${QPID_DIR} ; then
# Source tree path
CLUSTER_DIR=${QPID_DIR}/cpp/src/tests
else
16 years, 10 months
rhmessaging commits: r3424 - mgmt/trunk/cumin/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-05 13:17:25 -0400 (Fri, 05 Jun 2009)
New Revision: 3424
Modified:
mgmt/trunk/cumin/resources/app.js
Log:
Handle mousing over the highlight square to prevent the square from flashing.
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-06-04 20:37:49 UTC (rev 3423)
+++ mgmt/trunk/cumin/resources/app.js 2009-06-05 17:17:25 UTC (rev 3424)
@@ -111,6 +111,10 @@
event.stop();
});
mImg.addEvent('mouseout', function(event){
+ if (event.relatedTarget.className.indexOf("img") == 0) {
+ event.stop();
+ return false;
+ }
var oHighlight = document.body.getElement(".imgHighlight_red");
if (oHighlight) oHighlight.style.display = "none";
oHighlight = document.body.getElement(".imgHighlight_green");
@@ -162,7 +166,7 @@
oValues.style.display = "block";
oValues.style.left = (pos.x + xy[0] + 32) + "px";
oValues.style.top = (pos.y + xy[1] - 8) + "px";
- oValues.innerHTML = "("+point[2].toFixed(2)+")";
+ oValues.innerHTML = "("+point[2]+")";
}
var points = mImg.retrieve('points');
16 years, 10 months
rhmessaging commits: r3423 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:37:49 -0400 (Thu, 04 Jun 2009)
New Revision: 3423
Modified:
mgmt/trunk/cumin/python/cumin/widgets.py
mgmt/trunk/cumin/python/cumin/widgets.strings
Log:
Added "Page Updated" indicator to top-left of all pages.
Paused background updates after 30 minutes.
Added "Resume Updates" button that displays after updates are paused.
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2009-06-04 20:37:02 UTC (rev 3422)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2009-06-04 20:37:49 UTC (rev 3423)
@@ -45,6 +45,9 @@
def get_default(self, session):
return list()
+class CuminHeartBeat(Widget):
+ pass
+
class CuminMainView(TabbedModeSet):
def __init__(self, app, name):
super(CuminMainView, self).__init__(app, name)
@@ -54,6 +57,9 @@
self.actions = ActionInvocationSet(app, "actions")
self.add_child(self.actions)
+ heartbeat = CuminHeartBeat(app, "heartbeat")
+ self.add_child(heartbeat)
+
def do_process(self, session, *args):
self.actions.process(session)
Modified: mgmt/trunk/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.strings 2009-06-04 20:37:02 UTC (rev 3422)
+++ mgmt/trunk/cumin/python/cumin/widgets.strings 2009-06-04 20:37:49 UTC (rev 3423)
@@ -108,6 +108,56 @@
top: -2px;
}
+[CuminMainView.javascript]
+ wooly.addPageUpdateListener( function () {
+ var myEffect = new Fx.Morph('heartbeat', {duration: 1000});
+ $('shock').style.display = "none";
+ $('heartbeat').style.display = "inline";
+ $('heartbeat').style.color = "#000000";
+ setTimeout(function () {myEffect.start({ 'color': ['#000000', '#CCCCCC'] })}, 500);
+
+ });
+ cumin.expireIntervalUpdate = function () {
+ if (typeof cumin.expireID != "undefined") {
+ if (cumin.expireID) {
+ window.clearTimeout(cumin.expireID);
+ cumin.expireID = null;
+ }
+ }
+ cumin.expireID = setTimeout(function () {
+ wooly.cancelIntervalUpdate();
+ setTimeout(function () {
+ $('heartbeat').style.display = "none";
+ $('shock').style.display = "block"}, 1000);
+ $('shock').onclick = function () {
+ wooly.resumeIntervalUpdate();
+ cumin.expireIntervalUpdate();
+ }
+ }, 30*60*1000);
+ };
+ cumin.expireIntervalUpdate();
+
+[CuminHeartBeat.css]
+#updateStatus {
+ float:right;
+ padding: 0.25em;
+ font-size: 0.8em;
+}
+#updateStatus button {
+ display: none;
+ margin-left:0.5em;
+ padding: 0;
+ background-color: #FFF0F0;
+ color: #600;
+ border: 1px solid #C00;
+}
+
+[CuminHeartBeat.html]
+<div id="updateStatus">
+ <span id="heartbeat">Page Updated</span>
+ <button id="shock">Resume Updates</button>
+</div>
+
[CuminMainView.html]
<div id="head">
<div id="user">
@@ -123,6 +173,7 @@
<div id="body">
<div id="messages" style="display: {action_display};"><p title="close" onclick="cumin.hideActions()">x</p>{actions}</div>
+ {heartbeat}
{content}</div>
16 years, 10 months
rhmessaging commits: r3422 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2009-06-04 16:37:02 -0400 (Thu, 04 Jun 2009)
New Revision: 3422
Modified:
mgmt/trunk/mint/python/mint/expire.py
mgmt/trunk/mint/python/mint/sql.py
Log:
expire all non-persistent objects after threshold, instead of just timestamping with the deletion time
Modified: mgmt/trunk/mint/python/mint/expire.py
===================================================================
--- mgmt/trunk/mint/python/mint/expire.py 2009-06-04 20:35:18 UTC (rev 3421)
+++ mgmt/trunk/mint/python/mint/expire.py 2009-06-04 20:37:02 UTC (rev 3422)
@@ -23,7 +23,8 @@
for cls in mint.schema.statsClasses:
self.ops.append(SqlExpire(eval(cls), self.keepCurrStats))
- self.ops.append(SqlExpire(Job, self.keepCurrStats))
+ for cls in mint.schema.entityClasses:
+ self.ops.append(SqlExpire(eval(cls), self.keepCurrStats))
self.attrs["threshold"] = threshold
Modified: mgmt/trunk/mint/python/mint/sql.py
===================================================================
--- mgmt/trunk/mint/python/mint/sql.py 2009-06-04 20:35:18 UTC (rev 3421)
+++ mgmt/trunk/mint/python/mint/sql.py 2009-06-04 20:37:02 UTC (rev 3422)
@@ -160,11 +160,13 @@
""" % (table)
if self.keepCurrStats:
sql += " and id not in (select stats_curr_id from %s)" % (parent_table)
- elif self.cls is mint.Job:
+ else:
sql = """
delete from %s
where qmf_delete_time < now() - interval '%%(threshold)s seconds'
""" % (table)
+ if self.cls is not mint.Job:
+ sql += " and qmf_persistent = 'f' "
return sql
16 years, 10 months
rhmessaging commits: r3421 - in mgmt/trunk/cumin: resources and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:35:18 -0400 (Thu, 04 Jun 2009)
New Revision: 3421
Modified:
mgmt/trunk/cumin/python/cumin/stat.py
mgmt/trunk/cumin/python/cumin/stat.strings
mgmt/trunk/cumin/resources/app.css
mgmt/trunk/cumin/resources/app.js
Log:
Added mouseover on charts to highlight data points.
Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py 2009-06-04 20:32:05 UTC (rev 3420)
+++ mgmt/trunk/cumin/python/cumin/stat.py 2009-06-04 20:35:18 UTC (rev 3421)
@@ -200,14 +200,27 @@
return (None, None)
+ def get_current(self, name):
+ if name in self.__files:
+ file = self.__files[name]["file"]
+ file.seek(0)
+ print "found current %s" % name
+ return (file.read(), self.__files[name]["cookie"])
+ else:
+ print "MISSED %s" % name
+ return (None, None)
+
+
def create_cache_file(self, name, args):
if name not in self.__files:
#file = tempfile.TemporaryFile()
file = cStringIO.StringIO()
+ print "added %s" % name
else:
file = self.__files[name]["file"]
file.seek(0)
file.truncate()
+ print "re-used %s" % name
self.__files[name] = {"time": datetime.now(), "file": file, "cookie": args}
return file
@@ -356,6 +369,9 @@
self.method.default = "avg"
self.add_parameter(self.method)
+ self.samples = BooleanParameter(app, "samples")
+ self.add_parameter(self.samples)
+
self.container_width = IntegerParameter(app, "width")
self.container_width.default = 360
self.add_parameter(self.container_width)
@@ -367,7 +383,7 @@
self.cache = ImageCache()
def get_content_type(self, session):
- return "image/png"
+ return self.samples.get(session) and "text/plain" or "image/png"
def get_cache_control(self, session):
return "no-cache"
@@ -382,13 +398,23 @@
def get_cached(self, session, recent):
filename = self.gen_filename(session)
- chart, last_recent = self.cache.find_recent(filename, 3)
- if recent == last_recent:
- return chart
+ chart, args = self.cache.find_recent(filename, 30)
+ if args:
+ last_recent, samples, xy = args
+ if recent == last_recent:
+ return chart
- def cache_it(self, session, chart, recent):
+ def get_cached_samples(self, session, recent):
+ branch = session.branch()
+ self.samples.set(branch, False)
+ filename = self.gen_filename(branch)
+ chart, args = self.cache.get_current(filename)
+ if args:
+ return (args['samples'], args['title_xy'])
+
+ def cache_it(self, session, chart, args):
filename = self.gen_filename(session)
- writer = self.cache.create_cache_file(filename, recent)
+ writer = self.cache.create_cache_file(filename, args)
chart.write(writer)
def get_interval(self, session, duration, width):
@@ -399,18 +425,38 @@
max_samples = int(width * 1.5)
return max(int(duration / max_samples), 1)
+ def render_samples(self, session, recent, colors):
+ c = {(1,0,0): "red", (0,0,1): "blue", (0,1,0): "green"}
+ cached_samples, title_xy = self.get_cached_samples(session, recent)
+ if cached_samples:
+ rets = dict()
+ for stat, color, xy in zip(cached_samples, colors, title_xy):
+ ret = dict()
+ ret["color"] = c[color]
+ ret["points"] = cached_samples[stat]
+ ret["xy"] = xy
+ rets[stat.name] = ret
+ return str(rets)
+
def do_render(self, session, object):
+ colors = ((1,0,0), (0,0,1), (0,1,0))
+
cls = self.class_.get(session)
stats = [getattr(cls, x) for x in self.stats.get(session)]
+ recent = None
if len(stats):
stat = stats[0]
recent = stat.recent(object)
- if recent:
- cached_png = self.get_cached(session, recent)
- if cached_png:
- return cached_png
+ if self.samples.get(session):
+ return self.render_samples(session, recent, colors)
+
+ if recent:
+ cached_png = self.get_cached(session, recent)
+ if cached_png:
+ return cached_png
+
width = self.container_width.get(session)
height = self.container_height.get(session)
chart = TimeSeriesChart(width, height)
@@ -476,10 +522,9 @@
chart.plot_x_axis(x_intervals, x_step)
chart.plot_y_axis(y_intervals, y_step)
- colors = ((1,0,0), (0,0,1), (0,1,0), (0,0,0))
-
+ points = dict()
for stat, color in zip(stats, colors):
- chart.plot_values(samples[stat], color=color)
+ points[stat] = chart.plot_values(samples[stat], color=color)
for stat, color in zip(stats, colors):
chart.plot_ticks(samples[stat], color=color)
@@ -491,9 +536,9 @@
else:
titles = [x.title for x in stats]
- chart.plot_legend(titles, colors)
+ title_xy = chart.plot_legend(titles, colors)
- self.cache_it(session, chart, recent)
+ self.cache_it(session, chart, {'recent': recent, 'samples': points, "title_xy": title_xy})
writer = Writer()
chart.write(writer)
@@ -590,6 +635,12 @@
import sys
try:
- pass
- except:
+ connuri = sys.argv[1]
+ conn = connectionForURI(connuri)
+ sqlhub.processConnection = conn
+ except IndexError:
+ print "Usage: stat.py DATABASE-URI"
sys.exit(1)
+
+ #data = DemoData()
+ #data.load()
Modified: mgmt/trunk/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.strings 2009-06-04 20:32:05 UTC (rev 3420)
+++ mgmt/trunk/cumin/python/cumin/stat.strings 2009-06-04 20:35:18 UTC (rev 3421)
@@ -159,6 +159,9 @@
setTimeout("showLoading('"+id+"')", 1000);
setTimeout("hideLoading('"+id+"')", 1000 * 60);
+ wooly.cancelIntervalUpdate();
+ wooly.resumeIntervalUpdate();
+ cumin.expireIntervalUpdate();
return false;
}
@@ -181,7 +184,21 @@
}
});
+function gotChartPoints(text, oImg) {
+ var mImg = $(oImg);
+ mImg.store('points', eval("("+text+")"));
+ var e = {'client': {'x': mImg.retrieve("lastX")}};
+ cumin.chartMove(mImg, e);
+}
+function get_chart_points(oImg) {
+ $(oImg).store('points', null);
+ var branch = wooly.session.branch(oImg.src);
+ branch.samples = 't';
+ var req = branch.marshal();
+ wooly.setIntervalUpdate(req, gotChartPoints, 0, oImg, true);
+}
+
[StatValueChart.html]
<div>
<div class="StatValueChart{fullpageable}" id="{id}">
@@ -206,3 +223,4 @@
<span class="swatch" style="background-color: {stat_color}"> </span>
<span class="ph" statname="{stat_name}" statmode="{mode}">{stat_value}</span>
</li>
+
Modified: mgmt/trunk/cumin/resources/app.css
===================================================================
--- mgmt/trunk/cumin/resources/app.css 2009-06-04 20:32:05 UTC (rev 3420)
+++ mgmt/trunk/cumin/resources/app.css 2009-06-04 20:35:18 UTC (rev 3421)
@@ -565,3 +565,48 @@
z-index: 199;
}
+div.imgHighlight_red {
+ border: 1px solid red;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
+}
+div.imgHighlight_green {
+ border: 1px solid green;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
+}
+div.imgHighlight_blue {
+ border: 1px solid blue;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
+}
+div.imgValues_red {
+ color: red;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
+}
+div.imgValues_green {
+ color: green;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
+}
+div.imgValues_blue {
+ color: blue;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
+}
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-06-04 20:32:05 UTC (rev 3420)
+++ mgmt/trunk/cumin/resources/app.js 2009-06-04 20:35:18 UTC (rev 3421)
@@ -92,7 +92,8 @@
chart.onfullpage = function (width, height) { cumin.chartNotify(true, width, height, id); };
chart.onrestore = function () { cumin.chartNotify(false, width, 100, id); };
var oImg = document.images[id];
- $(oImg).addEvent('load', function () {
+ var mImg = $(oImg);
+ mImg.addEvent('load', function () {
this.style.visibility = "visible";
this.removeAttribute("width");
this.removeAttribute("height");
@@ -100,13 +101,84 @@
var loading = chart.getElement(".loading");
loading.setStyle('display', 'none');
loading.setStyle('visibility', 'visible');
- loading.loading = false
+ loading.loading = false;
+ var over = mImg.retrieve("over");
+ if (over) {
+ get_chart_points(oImg);
+ }
});
- $(oImg).addEvent('mousedown', function(event){
+ mImg.addEvent('mousedown', function(event){
event.stop();
});
+ mImg.addEvent('mouseout', function(event){
+ var oHighlight = document.body.getElement(".imgHighlight_red");
+ if (oHighlight) oHighlight.style.display = "none";
+ oHighlight = document.body.getElement(".imgHighlight_green");
+ if (oHighlight) oHighlight.style.display = "none";
+ oHighlight = document.body.getElement(".imgHighlight_blue");
+ if (oHighlight) oHighlight.style.display = "none";
+ var oValue = document.body.getElement(".imgValues_red");
+ if (oValue) oValue.style.display = "none";
+ oValue = document.body.getElement(".imgValues_green");
+ if (oValue) oValue.style.display = "none";
+ oValue = document.body.getElement(".imgValues_blue");
+ if (oValue) oValue.style.display = "none";
+ mImg.store("over", false);
+ });
+ mImg.addEvent('mouseover', function(event){
+ mImg.store("over", true);
+ get_chart_points(mImg);
+ });
+ mImg.addEvent('mousemove', function(event){
+ cumin.chartMove(mImg, event);
+ });
}
+ this.chartMove = function (mImg, event) {
+ closestPoint = function (x, info) {
+ samples = info['points'];
+ var closest = samples[0];
+ for (var i=0; i<samples.length; i++) {
+ var coord = samples[i];
+ if (Math.abs(x - coord[0]) < Math.abs(x -closest[0]))
+ closest = coord;
+ }
+ return closest;
+ }
+ highlight = function (stat, point, xy) {
+ var oHighlight = document.body.getElement(".imgHighlight_"+stat);
+ var oValues = document.body.getElement(".imgValues_"+stat);
+ if (!oHighlight) {
+ oHighlight = new Element('div', { 'class': 'imgHighlight_'+stat });
+ oValues = new Element('div', { 'class': 'imgValues_'+stat });
+ document.body.appendChild(oHighlight);
+ document.body.appendChild(oValues);
+ }
+ var pos = mImg.getPosition();
+ oHighlight.style.display = "block";
+ oHighlight.style.left = (pos.x + point[0] - 5) + "px";
+ oHighlight.style.top = (pos.y + point[1] - 3) + "px";
+
+ oValues.style.display = "block";
+ oValues.style.left = (pos.x + xy[0] + 32) + "px";
+ oValues.style.top = (pos.y + xy[1] - 8) + "px";
+ oValues.innerHTML = "("+point[2].toFixed(2)+")";
+ }
+
+ var points = mImg.retrieve('points');
+ if (points) {
+ for (var stat in points) {
+ var samples = points[stat];
+ var x = event.client.x;
+ mImg.store("lastX", x);
+ var pos = mImg.getPosition();
+ var point = closestPoint(x - pos.x, samples);
+ if (typeof point != "undefined")
+ highlight(points[stat]['color'], point, points[stat]['xy']);
+ }
+ }
+ }
+
this.chartNotify = function (full, width, height, id) {
var oImg = document.images[id];
if (oImg) {
@@ -254,5 +326,6 @@
});
}
wooly.restartIntervalUpdate(branch.marshal());
+ cumin.expireIntervalUpdate();
}
}
\ No newline at end of file
16 years, 10 months
rhmessaging commits: r3420 - mgmt/trunk/cumin/python/cumin/messaging.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:32:05 -0400 (Thu, 04 Jun 2009)
New Revision: 3420
Modified:
mgmt/trunk/cumin/python/cumin/messaging/queue.py
Log:
Comment out QueueStatus box.
Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.py 2009-06-04 20:31:06 UTC (rev 3419)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.py 2009-06-04 20:32:05 UTC (rev 3420)
@@ -279,8 +279,8 @@
def __init__(self, app, name):
super(QueueView, self).__init__(app, name)
- status = QueueStatus(app, "status")
- self.add_child(status)
+ #status = QueueStatus(app, "status")
+ #self.add_child(status)
self.__tabs = TabbedModeSet(app, "tabs")
self.add_child(self.__tabs)
16 years, 10 months
rhmessaging commits: r3419 - mgmt/trunk/cumin/python/cumin/grid.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:31:06 -0400 (Thu, 04 Jun 2009)
New Revision: 3419
Modified:
mgmt/trunk/cumin/python/cumin/grid/job.py
Log:
Remove JobGroupStatus
Modified: mgmt/trunk/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.py 2009-06-04 20:30:25 UTC (rev 3418)
+++ mgmt/trunk/cumin/python/cumin/grid/job.py 2009-06-04 20:31:06 UTC (rev 3419)
@@ -362,9 +362,6 @@
summary = CuminSummary(app, "summary")
self.add_child(summary)
- status = JobGroupStatus(app, "status")
- self.add_child(status)
-
self.__tabs = TabbedModeSet(app, "tabs")
self.add_child(self.__tabs)
16 years, 10 months
rhmessaging commits: r3418 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:30:25 -0400 (Thu, 04 Jun 2009)
New Revision: 3418
Modified:
mgmt/trunk/cumin/python/cumin/charts.py
Log:
Accumulate (x,y) points as they are drawn on the charts for use in the mouseover javascript.
Modified: mgmt/trunk/cumin/python/cumin/charts.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/charts.py 2009-06-04 20:26:30 UTC (rev 3417)
+++ mgmt/trunk/cumin/python/cumin/charts.py 2009-06-04 20:30:25 UTC (rev 3418)
@@ -153,6 +153,7 @@
cr.set_source_rgba(color[0], color[1], color[2], 0.66)
tnow = time()
+ points = list()
for dt, value, dev in samples:
if value is None:
@@ -167,8 +168,12 @@
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)
+ if x < 0:
+ break
+ points.append([int(x), int(y), value])
cr.stroke()
+ return points
def plot_ticks(self, samples, color=(0, 0, 0)):
cr = Context(self.surface)
@@ -212,6 +217,7 @@
def plot_legend(self, titles, colors):
cr = Context(self.surface)
cr.set_line_width(1.5)
+ title_xy = list()
for i, item in enumerate(zip(titles, colors)):
title, color = item
@@ -232,6 +238,10 @@
cr.show_text(title)
cr.stroke()
+ width, height = cr.text_extents(title)[2:4]
+ title_xy.append([width, y])
+ return title_xy
+
def plot_frame(self, color=(0.8, 0.8, 0.8)):
cr = Context(self.surface)
cr.set_line_width(1)
16 years, 10 months
rhmessaging commits: r3417 - mgmt/trunk/wooly/python/wooly.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:26:30 -0400 (Thu, 04 Jun 2009)
New Revision: 3417
Modified:
mgmt/trunk/wooly/python/wooly/pages.strings
Log:
Removed the timer to double the background update interval.
Modified: mgmt/trunk/wooly/python/wooly/pages.strings
===================================================================
--- mgmt/trunk/wooly/python/wooly/pages.strings 2009-06-04 20:25:43 UTC (rev 3416)
+++ mgmt/trunk/wooly/python/wooly/pages.strings 2009-06-04 20:26:30 UTC (rev 3417)
@@ -38,7 +38,6 @@
<script type="text/javascript">
// <![CDATA[
wooly.setIntervalUpdate('{url}', wooly.updatePage, {interval});
- setInterval(wooly.doubleIntervalUpdate, 1000 * 60 * 60);
// ]]>
</script>
16 years, 10 months
rhmessaging commits: r3416 - mgmt/trunk/wooly/resources.
by rhmessaging-commits＠lists.jboss.org
Author: eallen
Date: 2009-06-04 16:25:43 -0400 (Thu, 04 Jun 2009)
New Revision: 3416
Modified:
mgmt/trunk/wooly/resources/wooly.js
Log:
Add ability to return responseText from an Ajax call.
Added resumeIntervalUpdate to resume the background updates after they have been paused.
Modified: mgmt/trunk/wooly/resources/wooly.js
===================================================================
--- mgmt/trunk/wooly/resources/wooly.js 2009-06-04 13:33:41 UTC (rev 3415)
+++ mgmt/trunk/wooly/resources/wooly.js 2009-06-04 20:25:43 UTC (rev 3416)
@@ -380,7 +380,7 @@
passback: null
};
- this.setIntervalUpdate = function(url, callback, interval, passback) {
+ this.setIntervalUpdate = function(url, callback, interval, passback, astext) {
var req = this.getNewRequest();
function fetch() {
@@ -410,7 +410,10 @@
function update() {
try {
if (req.readyState == 4 && req.status == 200) {
- callback(req.responseXML, passback);
+ if (astext == true)
+ callback(req.responseText, passback);
+ else
+ callback(req.responseXML, passback);
}
} catch (e) {
log(e);
@@ -447,6 +450,12 @@
return this.session.branch(this.intervalUpdateInfo.url);
}
+ this.resumeIntervalUpdate = function () {
+ wooly.setIntervalUpdate(wooly.intervalUpdateInfo.url,
+ wooly.intervalUpdateInfo.callback,
+ wooly.intervalUpdateInfo.interval,
+ wooly.intervalUpdateInfo.passback);
+ }
this.doubleIntervalUpdate = function () {
wooly.cancelIntervalUpdate();
wooly.intervalUpdateInfo.interval *= 2;
16 years, 10 months