11:41 a.m.
Author: justi9
Date: 2007-11-05 12:41:37 -0500 (Mon, 05 Nov 2007)
New Revision: 1234
Modified:
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/client.strings
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/exchange.strings
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/queue.strings
mgmt/cumin/python/cumin/widgets.py
mgmt/notes/justin-todo.txt
Log:
Adds timestamps for creation, deletion, and updates to q,e,c.
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/client.py 2007-11-05 17:41:37 UTC (rev 1234)
@@ -75,6 +75,12 @@
def render_auth_id(self, session, client):
return "e50e7dcaa8d6a039a"
+ def render_created_deleted(self, session, queue):
+ return "%s - %s" % (fmt_datetime(datetime.utcnow()), "")
+
+ def render_updated(self, session, queue):
+ return fmt_datetime(datetime.utcnow())
+
class ClientStatistics(TabSet):
def __init__(self, app, name):
super(ClientStatistics, self).__init__(app, name)
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/client.strings 2007-11-05 17:41:37 UTC (rev 1234)
@@ -40,6 +40,8 @@
<table class="props">
<tr><th>Address</th><td>{address}</td></tr>
<tr><th>Auth. ID</th><td>{auth_id}</td></tr>
+ <tr><th>Created -
Deleted</th><td>{created_deleted}</td></tr>
+ <tr><th>Updated</th><td>{updated}</td></tr>
<tr>
<th class="actions" colspan="2">
<h2>Act on This Client:</h2>
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/exchange.py 2007-11-05 17:41:37 UTC (rev 1234)
@@ -136,7 +136,7 @@
def render_title(self, session, exchange):
return "Exchange '%s'" % exchange.name
- def render_exchange_name(self, session, exchange):
+ def render_name(self, session, exchange):
return exchange.name
def render_type(self, session, exchange):
@@ -149,6 +149,12 @@
else:
raise Exception()
+ def render_created_deleted(self, session, queue):
+ return "%s - %s" % (fmt_datetime(datetime.utcnow()), "")
+
+ def render_updated(self, session, queue):
+ return fmt_datetime(datetime.utcnow())
+
class ExchangeBindingSet(ItemSet):
def render_title(self, session, exchange):
return "Queue Bindings (%i)" % len(exchange.binding_items())
Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/exchange.strings 2007-11-05 17:41:37 UTC (rev 1234)
@@ -88,10 +88,12 @@
<h1><img src="resource?name=exchange-36.png"> {title}</h1>
-<dl class="properties">
- <dt>Name</dt><dd>{exchange_name}</dd>
- <dt>Type</dt><dd>{type}</dd>
-</dl>
+<table class="props">
+ <tr><th>Name</th><td>{name}</td></tr>
+ <tr><th>Type</th><td>{type}</td></tr>
+ <tr><th>Created -
Deleted</th><td>{created_deleted}</td></tr>
+ <tr><th>Updated</th><td>{updated}</td></tr>
+</table>
{tabs}
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/page.strings 2007-11-05 17:41:37 UTC (rev 1234)
@@ -175,7 +175,7 @@
table.props {
margin: 0 0 1.5em 0;
- width: 25em;
+ width: 30em;
border-collapse: collapse;
}
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/queue.py 2007-11-05 17:41:37 UTC (rev 1234)
@@ -2,6 +2,7 @@
from wooly.widgets import *
from wooly.forms import *
from wooly.resources import *
+from datetime import datetime
from exchange import ExchangeInputSet
from measurement import *
@@ -172,6 +173,12 @@
def render_exclusive(self, session, queue):
return yes_no(queue.is_exclusive)
+ def render_created_deleted(self, session, queue):
+ return "%s - %s" % (fmt_datetime(datetime.utcnow()), "")
+
+ def render_updated(self, session, queue):
+ return fmt_datetime(datetime.utcnow())
+
class QueueBindingSet(ItemSet):
def render_title(self, session, queue):
return "Exchange Bindings (%i)" % len(queue.binding_items())
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/queue.strings 2007-11-05 17:41:37 UTC (rev 1234)
@@ -160,6 +160,8 @@
<tr><th>Name</th><td>{name}</td></tr>
<tr><th>Durable?</th><td>{durable}</td></tr>
<tr><th>Exclusive?</th><td>{exclusive}</td></tr>
+ <tr><th>Created -
Deleted</th><td>{created_deleted}</td></tr>
+ <tr><th>Updated</th><td>{updated}</td></tr>
<tr>
<th class="actions" colspan="2">
<h2>Act on This Queue:</h2>
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/cumin/python/cumin/widgets.py 2007-11-05 17:41:37 UTC (rev 1234)
@@ -1,6 +1,7 @@
from wooly import *
from wooly.widgets import *
from wooly.forms import *
+from datetime import datetime
from util import *
from charts import *
@@ -44,6 +45,9 @@
#return "%i <small>%s/%s</small>" % (value, unit1, unit2)
return "%i<small>/%s</small>" % (value, unit2)
+def fmt_datetime(dtime):
+ return dtime.strftime("%d %b %Y %H:%M")
+
class CuminFrame(Frame, ModeSet):
def __init__(self, app, name):
super(CuminFrame, self).__init__(app, name)
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2007-11-05 16:56:24 UTC (rev 1233)
+++ mgmt/notes/justin-todo.txt 2007-11-05 17:41:37 UTC (rev 1234)
@@ -4,10 +4,6 @@
- Find/connect in bulk
- * Queue: Add created, deleted, updated timestamps
-
- * Fix the broken charts
-
Deferred
* Queue: Add a msg enq rate msg deq rate chart