diff --git a/src/java/com/threerings/presents/server/AbstractSignalHandler.java b/src/java/com/threerings/presents/server/AbstractSignalHandler.java
index eaa17c1dc..c8d32e9e2 100644
--- a/src/java/com/threerings/presents/server/AbstractSignalHandler.java
+++ b/src/java/com/threerings/presents/server/AbstractSignalHandler.java
@@ -22,8 +22,6 @@
package com.threerings.presents.server;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
import static com.threerings.presents.Log.log;
/**
@@ -73,14 +71,6 @@ public abstract class AbstractSignalHandler
log.info(_repmgr.generateReport(ReportManager.DEFAULT_TYPE));
}
- protected void usr1Received ()
- {
- if (_usr1receiver != null) {
- _usr1receiver.received();
- }
-
- }
-
protected void usr2Received ()
{
if (_usr2receiver != null) {
@@ -88,8 +78,7 @@ public abstract class AbstractSignalHandler
}
}
- @Inject(optional=true) @Named(SignalReceiver.USR1) protected SignalReceiver _usr1receiver;
- @Inject(optional=true) @Named(SignalReceiver.USR2) protected SignalReceiver _usr2receiver;
+ @Inject(optional=true) protected SignalReceiver _usr2receiver;
@Inject protected PresentsServer _server;
@Inject protected ReportManager _repmgr;
}
diff --git a/src/java/com/threerings/presents/server/NativeSignalHandler.java b/src/java/com/threerings/presents/server/NativeSignalHandler.java
index 606894f4e..743eb2e11 100644
--- a/src/java/com/threerings/presents/server/NativeSignalHandler.java
+++ b/src/java/com/threerings/presents/server/NativeSignalHandler.java
@@ -44,9 +44,6 @@ public class NativeSignalHandler extends AbstractSignalHandler
case SignalManager.SIGHUP:
hupReceived();
break;
- case SignalManager.SIGUSR1:
- usr1Received();
- break;
case SignalManager.SIGUSR2:
usr2Received();
break;
@@ -66,6 +63,7 @@ public class NativeSignalHandler extends AbstractSignalHandler
SignalManager.registerSignalHandler(SignalManager.SIGTERM, this);
SignalManager.registerSignalHandler(SignalManager.SIGINT, this);
SignalManager.registerSignalHandler(SignalManager.SIGHUP, this);
+ SignalManager.registerSignalHandler(SignalManager.SIGUSR2, this);
return true;
}
}
diff --git a/src/java/com/threerings/presents/server/SignalReceiver.java b/src/java/com/threerings/presents/server/SignalReceiver.java
index 8e9758de2..fdc22371b 100644
--- a/src/java/com/threerings/presents/server/SignalReceiver.java
+++ b/src/java/com/threerings/presents/server/SignalReceiver.java
@@ -1,23 +1,10 @@
package com.threerings.presents.server;
/**
- * Listens for Unix signals captured by {@link AbstractSignalHandler}.
+ * If injected into a presents server, listens for a USR2 Unix signal captured by
+ * {@link AbstractSignalHandler}.
*/
public interface SignalReceiver
{
-
- /**
- * Used to mark the receiver for the USR1 signal in guice injection. Bind implementations that
- * should receive this signal with
- * annotatedWith(Names.named(SignalReceiver.USR1)).
- */
- public static final String USR1 = "usr1";
- /**
- * Used to mark the receiver for the USR2 signal in guice injection. Bind implementations that
- * should receive this signal with
- * annotatedWith(Names.named(SignalReceiver.USR2)).
- */
- public static final String USR2 = "usr2";
-
void received();
}
diff --git a/src/java/com/threerings/presents/server/SunSignalHandler.java b/src/java/com/threerings/presents/server/SunSignalHandler.java
index 6cea633fe..6e22e06c8 100644
--- a/src/java/com/threerings/presents/server/SunSignalHandler.java
+++ b/src/java/com/threerings/presents/server/SunSignalHandler.java
@@ -42,11 +42,6 @@ public class SunSignalHandler extends AbstractSignalHandler
intReceived();
}
});
- SignalUtil.register(SignalUtil.Number.USR1, new SignalUtil.Handler() {
- public void signalReceived (SignalUtil.Number sig) {
- usr1Received();
- }
- });
SignalUtil.register(SignalUtil.Number.USR2, new SignalUtil.Handler() {
public void signalReceived (SignalUtil.Number sig) {
usr2Received();