From 9b9d62558decfd441055de42190f40d58d40e1a0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 18 May 2008 11:39:20 +0000
Subject: [PATCH] More unit cleanup.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5109 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../admin/server/DatabaseConfigRegistry.java  | 15 ++----
 .../presents/peer/server/PeerManager.java     | 48 ++++++-------------
 2 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java
index 843706d3a..0b6dc8eb0 100644
--- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java
+++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java
@@ -24,6 +24,7 @@ package com.threerings.admin.server;
 import java.util.HashMap;
 
 import com.samskivert.io.PersistenceException;
+import com.samskivert.jdbc.WriteOnlyUnit;
 import com.samskivert.jdbc.depot.PersistenceContext;
 import com.samskivert.util.Invoker;
 import com.samskivert.util.StringUtil;
@@ -288,16 +289,10 @@ public class DatabaseConfigRegistry extends ConfigRegistry
 
         protected void setAndFlush (final String field, final String value) {
             _data.put(field, value);
-            _invoker.postUnit(new Invoker.Unit() {
-                public boolean invoke () {
-                    try {
-                        _repo.updateConfig(_node, _path, field, value);
-                    } catch (PersistenceException pe) {
-                        Log.warning("Failed to update object configuration [path=" + _path +
-                                    ", field=" + field + ", value=" + value + "].");
-                        Log.logStackTrace(pe);
-                    }
-                    return false;
+            String iname = "updateConfig(" + _path + ", " + field + ", value=" + value + ")";
+            _invoker.postUnit(new WriteOnlyUnit(iname) {
+                public void invokePersist () throws Exception {
+                    _repo.updateConfig(_node, _path, field, value);
                 }
             });
         }
diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java
index 878472527..6d8761eb5 100644
--- a/src/java/com/threerings/presents/peer/server/PeerManager.java
+++ b/src/java/com/threerings/presents/peer/server/PeerManager.java
@@ -33,7 +33,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 
-import com.samskivert.io.PersistenceException;
+import com.samskivert.jdbc.RepositoryUnit;
+import com.samskivert.jdbc.WriteOnlyUnit;
 import com.samskivert.jdbc.depot.PersistenceContext;
 import com.samskivert.util.ArrayIntSet;
 import com.samskivert.util.ChainedResultListener;
@@ -215,15 +216,9 @@ public class PeerManager
         // register ourselves with the node table
         _self = new NodeRecord(
             _nodeName, hostName, (publicHostName == null) ? hostName : publicHostName, port);
-        _invoker.postUnit(new Invoker.Unit("registerNode") {
-            public boolean invoke () {
-                try {
-                    _noderepo.updateNode(_self);
-                } catch (PersistenceException pe) {
-                    log.warning("Failed to register node record [rec=" + _self +
-                                ", error=" + pe + "].");
-                }
-                return false;
+        _invoker.postUnit(new WriteOnlyUnit("registerNode(" + _self + ")") {
+            public void invokePersist () throws Exception {
+                _noderepo.updateNode(_self);
             }
         });
 
@@ -702,15 +697,9 @@ public class PeerManager
         PresentsServer.clmgr.removeClientObserver(this);
 
         // clear our record from the node table
-        _invoker.postUnit(new Invoker.Unit("deleteNode") {
-            public boolean invoke () {
-                try {
-                    _noderepo.deleteNode(_nodeName);
-                } catch (PersistenceException pe) {
-                    log.warning("Failed to delete node record [nodeName=" + _nodeName +
-                                ", error=" + pe + "].");
-                }
-                return false;
+        _invoker.postUnit(new WriteOnlyUnit("deleteNode(" + _nodeName + ")") {
+            public void invokePersist () throws Exception {
+                _noderepo.deleteNode(_nodeName);
             }
         });
 
@@ -803,21 +792,14 @@ public class PeerManager
     protected void refreshPeers ()
     {
         // load up information on our nodes
-        _invoker.postUnit(new Invoker.Unit("refreshPeers") {
-            public boolean invoke () {
-                try {
-                    // let the world know that we're alive
-                    _noderepo.heartbeatNode(_nodeName);
-                    // then load up all the peer records
-                    _nodes = _noderepo.loadNodes();
-                    return true;
-                } catch (PersistenceException pe) {
-                    log.warning("Failed to load node records: " + pe + ".");
-                    // we'll just try again next time
-                    return false;
-                }
+        _invoker.postUnit(new RepositoryUnit("refreshPeers") {
+            public void invokePersist () throws Exception {
+                // let the world know that we're alive
+                _noderepo.heartbeatNode(_nodeName);
+                // then load up all the peer records
+                _nodes = _noderepo.loadNodes();
             }
-            public void handleResult () {
+            public void handleSuccess() {
                 for (NodeRecord record : _nodes) {
                     if (record.nodeName.equals(_nodeName)) {
                         continue;