feature flag cleanup (part 1)
@@ -17,7 +17,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
private static final long serialVersionUID = 1L;
public final static int BASEPORT = 19099;
- public final boolean useNewLogic;
@Override
public void getConfig(StateserverConfig.Builder builder) {
@@ -32,7 +31,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
ModelContext.FeatureFlags featureFlags)
{
super(parent, "slobrok." + index);
- this.useNewLogic = featureFlags.newLocationBrokerLogic();
portsMeta.on(0).tag("rpc").tag("admin").tag("status");
portsMeta.on(1).tag("http").tag("state");
setProp("index", index);
@@ -50,11 +48,8 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
}
public String getStartupCommand() {
- if (useNewLogic) {
return "exec $ROOT/sbin/vespa-slobrok -N -p " + getRpcPort() + " -c " + getConfigId();
}
- return "exec $ROOT/sbin/vespa-slobrok -p " + getRpcPort() + " -c " + getConfigId();
- }
@Override
public void allocatePorts(int start, PortAllocBridge from) {
