From 1400eed71d1cf3e7a78f6e8a07eaedea9053eb3a Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Thu, 4 Dec 2014 19:50:05 +0100 Subject: [PATCH] #186: I guess it was a copy/paste mistake, but stop should use the stop command --- .../jube/process/support/DefaultProcessController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/process-manager/src/main/java/io/fabric8/jube/process/support/DefaultProcessController.java b/process-manager/src/main/java/io/fabric8/jube/process/support/DefaultProcessController.java index 556094c..14f1e22 100644 --- a/process-manager/src/main/java/io/fabric8/jube/process/support/DefaultProcessController.java +++ b/process-manager/src/main/java/io/fabric8/jube/process/support/DefaultProcessController.java @@ -115,7 +115,7 @@ public int start() throws Exception { @Override public int stop() throws Exception { - String customCommand = config.getKillCommand(); + String customCommand = config.getStopCommand(); if (Strings.isNullOrEmpty(customCommand)) { // lets just kill it LOG.info("No stop command configured so lets just try killing it " + this); @@ -129,7 +129,7 @@ public int kill() throws Exception { String customCommand = config.getKillCommand(); if (Strings.isNullOrEmpty(customCommand)) { // lets stop it - LOG.info("No kill command configured so lets just try killing it " + this); + LOG.info("No kill command configured so lets just try killing it with -9 " + this); return Processes.killProcess(getPid(), "-9"); } return runConfigCommandValueOrLaunchScriptWith(customCommand, "kill"); @@ -175,7 +175,7 @@ public File getBaseDir() { public Executor getExecutor() { if (executor == null) { - executor = newFixedThreadPool(THREADS_PER_CONTROLLER, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("fuse-process-controller-%s").build()); + executor = newFixedThreadPool(THREADS_PER_CONTROLLER, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("jube-process-controller-%s").build()); } return executor; }