summaryrefslogtreecommitdiffstats
path: root/logd
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-19 12:40:24 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-11-20 21:53:15 +0000
commit64b7c822099d7cda921699e380c4d95608a1ab00 (patch)
treeaba34f4fd95ecc0d20f176f177550a3f369486e4 /logd
parent05377eb166b3d310774545fdd35172991dba9390 (diff)
milliseconds in config.
Diffstat (limited to 'logd')
-rw-r--r--logd/src/logd/config_subscriber.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/logd/src/logd/config_subscriber.cpp b/logd/src/logd/config_subscriber.cpp
index 7981e13a9a1..1e6c9a040d3 100644
--- a/logd/src/logd/config_subscriber.cpp
+++ b/logd/src/logd/config_subscriber.cpp
@@ -3,8 +3,6 @@
#include "config_subscriber.h"
#include "empty_forwarder.h"
#include "rpc_forwarder.h"
-#include <fcntl.h>
-#include <unistd.h>
#include <vespa/log/log.h>
LOG_SETUP("");
@@ -71,7 +69,7 @@ ConfigSubscriber::configure(std::unique_ptr<LogdConfig> cfg)
bool
ConfigSubscriber::checkAvailable()
{
- if (_subscriber.nextGeneration(0)) {
+ if (_subscriber.nextGenerationNow()) {
_has_available = true;
}
return _has_available;
@@ -103,7 +101,7 @@ ConfigSubscriber::ConfigSubscriber(const config::ConfigUri& configUri)
_server()
{
_handle = _subscriber.subscribe<LogdConfig>(configUri.getConfigId());
- _subscriber.nextConfig(0);
+ _subscriber.nextConfigNow();
configure(_handle->getConfig());
LOG(debug, "got logServer %s", _logserver_host.c_str());