Minor renaming/rewording.

projectodd · Oct 6, 2015 · 65c352e · 65c352e
1 parent d69a6ed
commit 65c352e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/core/src/main/java/org/projectodd/wunderboss/ec/ConcreteDaemonContext.java b/modules/core/src/main/java/org/projectodd/wunderboss/ec/ConcreteDaemonContext.java
@@ -111,8 +111,8 @@ public synchronized void stop() throws TimeoutException, InterruptedException {
 
             this.thread.join(threadTimeout);
             if (this.thread.isAlive()) {
-                throw new TimeoutException("Gave up after " + this.threadTimeout + " waiting for " +
-                                                   this.name + " daemon to exit.");
+                throw new TimeoutException("Gave up after " + this.threadTimeout + "ms waiting for " +
+                                                   this.name + " daemon to exit");
             }
         }
         this.clusterParticipant.disconnect();

diff --git a/modules/core/src/main/java/org/projectodd/wunderboss/ec/DaemonContext.java b/modules/core/src/main/java/org/projectodd/wunderboss/ec/DaemonContext.java
@@ -34,7 +34,7 @@ class CreateOption extends ExecutionContext.CreateOption {
         /**
          * The amount of time a daemon context will wait for its thread to exit, in millis.
          */
-        public static final CreateOption DAEMON_THREAD_JOIN_TIMEOUT = opt("daemon_thread_join_timeout", 30000L, CreateOption.class);
+        public static final CreateOption STOP_TIMEOUT = opt("stop_timeout", 30000L, CreateOption.class);
 
     }
 

diff --git a/modules/core/src/main/java/org/projectodd/wunderboss/ec/DaemonContextProvider.java b/modules/core/src/main/java/org/projectodd/wunderboss/ec/DaemonContextProvider.java
@@ -26,6 +26,6 @@ public DaemonContext create(final String name, final Options options) {
         return new ConcreteDaemonContext(name,
                                          clusterParticipant(name),
                                          options.getBoolean(DaemonContext.CreateOption.SINGLETON),
-                                         options.getLong(DaemonContext.CreateOption.DAEMON_THREAD_JOIN_TIMEOUT));
+                                         options.getLong(DaemonContext.CreateOption.STOP_TIMEOUT));
     }
 }