From 4eac8d74ad0217f66d16fcf519e998ff35a33e00 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Thu, 30 Sep 2021 07:44:16 +0000
Subject: feature flag cleanup (part 1)

---
 .../src/main/java/com/yahoo/vespa/model/admin/Slobrok.java         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'config-model/src/main/java/com')

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 07b1de3fdad..2b9551c2858 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
@@ -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,10 +48,7 @@ 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();
+        return "exec $ROOT/sbin/vespa-slobrok -N -p " + getRpcPort() + " -c " + getConfigId();
     }
 
     @Override
-- 
cgit v1.2.3