Author: justi9 Date: 2007-10-24 10:58:02 -0400 (Wed, 24 Oct 2007) New Revision: 1154 Modified: mgmt/cumin/python/cumin/model.py mgmt/cumin/python/cumin/queue.py mgmt/cumin/python/cumin/queue.strings mgmt/notes/Todo Log: Distinguishes stats for transactional messages from stats for transactions themselves. Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2007-10-24 14:30:29 UTC (rev 1153) +++ mgmt/cumin/python/cumin/model.py 2007-10-24 14:58:02 UTC (rev 1154) @@ -449,43 +449,43 @@ measure = Measurement("enqueueTxStarts", "int") measure.title = "Enq. trans. started" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("enqueueTxCommits", "int") measure.title = "Enq. trans. committed" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("enqueueTxRejects", "int") measure.title = "Enq. trans. rejected" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("enqueueTxCount", "int") measure.title = "Enq. trans. pending" - measure.categories = ("transactional") + measure.categories = ("transaction") measure.highlow = True self.measurements.append(measure) measure = Measurement("dequeueTxStarts", "int") measure.title = "Deq. trans. started" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("dequeueTxCommits", "int") measure.title = "Deq. trans. committed" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("dequeueTxRejects", "int") measure.title = "Deq. trans. rejected" - measure.categories = ("transactional") + measure.categories = ("transaction") self.measurements.append(measure) measure = Measurement("dequeueTxCount", "int") measure.title = "Deq. trans. pending" - measure.categories = ("transactional") + measure.categories = ("transaction") measure.highlow = True self.measurements.append(measure) Modified: mgmt/cumin/python/cumin/queue.py =================================================================== --- mgmt/cumin/python/cumin/queue.py 2007-10-24 14:30:29 UTC (rev 1153) +++ mgmt/cumin/python/cumin/queue.py 2007-10-24 14:58:02 UTC (rev 1154) @@ -372,6 +372,9 @@ self.add_child(MeasurementSet \ (app, "persistent_stats", "persistent")) + self.add_child(MeasurementSet \ + (app, "transaction_stats", "transaction")) + def render_title(self, session, queue): return "Current" Modified: mgmt/cumin/python/cumin/queue.strings =================================================================== --- mgmt/cumin/python/cumin/queue.strings 2007-10-24 14:30:29 UTC (rev 1153) +++ mgmt/cumin/python/cumin/queue.strings 2007-10-24 14:58:02 UTC (rev 1154) @@ -203,6 +203,8 @@ <td class="twocol"> <h2>Transactional Messages</h2> {transactional_stats} + <h2>Transactions</h2> + {transaction_stats} </td> </tr> </table> Modified: mgmt/notes/Todo =================================================================== --- mgmt/notes/Todo 2007-10-24 14:30:29 UTC (rev 1153) +++ mgmt/notes/Todo 2007-10-24 14:58:02 UTC (rev 1154) @@ -85,8 +85,6 @@ * Add a CuminItemSet with add/edit/remove href parts - * Make the groups browser use common code with the cluster browser - * Rename ServerGroupType to ServerGroupCategory * Add a frame() accessor to Widget @@ -109,7 +107,3 @@ * exch: link bindings, producers stats to respective views * model: get rid of the old *_count stat fields and use the new ones - - * queue: distinguish trans. msg stats from trans. stats - - * write up a designer work list