From 3e73a1666e413d6967e648a25eb6d2fe0c772a8e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 7 Jun 2008 19:21:33 +0000
Subject: [PATCH] Have the RebootManager do its shutdown via the
 ShutdownManager. Nix the PresentsServer legacy shutdown stuff. We'll wire
 that up in the legacy servers themselves.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5157 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/presents/server/PresentsServer.java  |  9 ---------
 .../threerings/presents/server/RebootManager.java   | 13 ++++++-------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java
index edf0ef830..c8260ca2e 100644
--- a/src/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/java/com/threerings/presents/server/PresentsServer.java
@@ -51,7 +51,6 @@ import static com.threerings.presents.Log.log;
  */
 @Singleton
 public class PresentsServer
-    implements ShutdownManager.Shutdowner
 {
     /** Configures dependencies needed by the Presents services. */
     public static class Module extends AbstractModule
@@ -142,9 +141,6 @@ public class PresentsServer
             injector.getInstance(NativeSignalHandler.class).init();
         }
 
-        // register with the shutdown manager to provide legacy centralized shutdown support
-        _shutmgr.registerShutdowner(this);
-
         // configure the dobject manager with our access controller
         _omgr.setDefaultAccessController(createDefaultObjectAccessController());
 
@@ -225,11 +221,6 @@ public class PresentsServer
         omgr.run();
     }
 
-    // from interface ShutdownManager.Shutdowner
-    public void shutdown ()
-    {
-    }
-
     /**
      * Called once the invoker and distributed object manager have both completed processing all
      * remaining events and are fully shutdown. <em>Note:</em> this is called as the last act of
diff --git a/src/java/com/threerings/presents/server/RebootManager.java b/src/java/com/threerings/presents/server/RebootManager.java
index 9e2b6d1ac..9ed2ea911 100644
--- a/src/java/com/threerings/presents/server/RebootManager.java
+++ b/src/java/com/threerings/presents/server/RebootManager.java
@@ -183,9 +183,9 @@ public abstract class RebootManager
     /**
      * Provides us with our dependencies.
      */
-    protected RebootManager (PresentsServer server, RootDObjectManager omgr)
+    protected RebootManager (ShutdownManager shutmgr, RootDObjectManager omgr)
     {
-        _server = server;
+        _shutmgr = shutmgr;
         _omgr = omgr;
     }
 
@@ -233,8 +233,7 @@ public abstract class RebootManager
             }
 
             // that's it! do the reboot
-            log.info("Performing automatic server reboot/shutdown, " +
-                     "as scheduled by: " + _initiator);
+            log.info("Performing automatic server reboot/shutdown, as scheduled by: " + _initiator);
             broadcast("m.rebooting_now");
 
             // wait 1 second, then do it
@@ -243,7 +242,7 @@ public abstract class RebootManager
                     // ...but we then post a LongRunnable...
                     _omgr.postRunnable(new PresentsDObjectMgr.LongRunnable() {
                         public void run () {
-                            _server.shutdown();
+                            _shutmgr.shutdown();
                         }
                     });
                 }
@@ -312,8 +311,8 @@ public abstract class RebootManager
         });
     }
 
-    /** The server we will reboot. */
-    protected PresentsServer _server;
+    /** Our shutdown manager, which is how we will reboot. */
+    protected ShutdownManager _shutmgr;
 
     /** Our distributed object manager. */
     protected RootDObjectManager _omgr;