summaryrefslogtreecommitdiffstats
path: root/slobrok/src/apps
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-04-05 19:34:49 +0200
committerGitHub <noreply@github.com>2018-04-05 19:34:49 +0200
commit1a217ade5f61adb837e9f0a257b92a63ba47a2ae (patch)
tree66d47aa6276fce9d77ec30fff9168c85015503b3 /slobrok/src/apps
parentc89efc910e1685fff335a08f3a45264638806771 (diff)
Revert "Balder/quick restart of slobrok"
Diffstat (limited to 'slobrok/src/apps')
-rw-r--r--slobrok/src/apps/slobrok/slobrok.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp
index e69f2df53f0..277cc2f3a87 100644
--- a/slobrok/src/apps/slobrok/slobrok.cpp
+++ b/slobrok/src/apps/slobrok/slobrok.cpp
@@ -50,6 +50,7 @@ int
App::Main()
{
uint32_t portnum = 2773;
+ uint32_t statePort = 0;
vespalib::string cfgId;
int argi = 1;
@@ -60,6 +61,9 @@ App::Main()
case 'c':
cfgId = std::string(optArg);
break;
+ case 's':
+ statePort = atoi(optArg);
+ break;
case 'p':
portnum = atoi(optArg);
break;
@@ -73,11 +77,10 @@ App::Main()
if (cfgId.empty()) {
LOG(debug, "no config id specified");
ConfigShim shim(portnum);
- mainobj = std::make_unique<SBEnv>(shim);
+ mainobj.reset(new SBEnv(shim));
} else {
- ConfigShim shim(portnum, cfgId);
- shim.enableStateServer(true);
- mainobj = std::make_unique<SBEnv>(shim);
+ ConfigShim shim(portnum, statePort, cfgId);
+ mainobj.reset(new SBEnv(shim));
}
hook_sigterm();
res = mainobj->MainLoop();