diff options
8 files changed, 8 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java index 8fb60545071..f15c60ca3c0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java @@ -29,6 +29,6 @@ public class Logd extends AbstractService { /** * @return The command used to start logd */ - public String getStartupCommand() { return "exec sbin/logd"; } + public String getStartupCommand() { return "exec sbin/vespa-logd"; } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java index dadb8bd408b..4f873b112cf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java @@ -29,7 +29,7 @@ public class Logserver extends AbstractService { * @return the startup command for the logserver */ public String getStartupCommand() { - return "exec $ROOT/bin/logserver-start " + getMyJVMArgs() + " " + getJvmArgs(); + return "exec $ROOT/bin/vespa-logserver-start " + getMyJVMArgs() + " " + getJvmArgs(); } /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java index 579b469ff14..0867fc2a299 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java @@ -41,7 +41,7 @@ public class Slobrok extends AbstractService { } public String getStartupCommand() { - return "exec $ROOT/bin/slobrok -p " + getPort() + + return "exec $ROOT/bin/vespa-slobrok -p " + getPort() + " -s " + getStatePort() + " -c " + getConfigId(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java index cba349f227c..7da6ab9bd99 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java @@ -50,7 +50,7 @@ public class Distributor extends ContentNode { @Override public String getStartupCommand() { - return "exec sbin/distributord -c $VESPA_CONFIG_ID"; + return "exec sbin/vespa-distributord -c $VESPA_CONFIG_ID"; } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java index 6b2a9a8c027..c8eceacc36d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java @@ -54,7 +54,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce public String getStartupCommand() { return isProviderProton() ? null - : "exec sbin/storaged -c $VESPA_CONFIG_ID"; + : "exec sbin/vespa-storaged -c $VESPA_CONFIG_ID"; } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java index 3f4242cfedf..6c2da51f3e3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java @@ -54,7 +54,7 @@ public class FileDistributorService extends AbstractService implements @Override public String getStartupCommand() { - return "exec $ROOT/sbin/filedistributor" + return "exec $ROOT/sbin/vespa-filedistributor" + " --configid " + getConfigId(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java index 954eb711916..c0867d252a3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java @@ -80,7 +80,7 @@ public class Dispatch extends AbstractService implements SearchInterface, * @return the startup command */ public String getStartupCommand() { - return "exec sbin/fdispatch -c $VESPA_CONFIG_ID"; + return "exec sbin/vespa-dispatch -c $VESPA_CONFIG_ID"; } public int getFrtPort() { return getRelativePort(0); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index ed36fad1ac6..7a3ded592bd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -235,7 +235,7 @@ public class SearchNode extends AbstractService implements @Override public String getStartupCommand() { - String startup = getEnvVariables() + "exec $ROOT/sbin/proton " + "--identity " + getConfigId(); + String startup = getEnvVariables() + "exec $ROOT/sbin/vespa-proton " + "--identity " + getConfigId(); if (serviceLayerService != null) { startup = startup + " --serviceidentity " + serviceLayerService.getConfigId(); } |