summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-02 13:01:25 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-04 10:40:33 +0200
commitb1088c7aae751c28f39ef551e1d4bf2f7599bcb3 (patch)
tree80dd5471679f25dcb8419384c88f80388f0f6893 /config
parentd74a4dd574b62f9c8619929d7f919807ff92321d (diff)
Ensure that we have gotten config at least once before starting up.
Diffstat (limited to 'config')
-rw-r--r--config/src/vespa/config/helper/configfetcher.cpp2
-rw-r--r--config/src/vespa/config/helper/configfetcher.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/config/src/vespa/config/helper/configfetcher.cpp b/config/src/vespa/config/helper/configfetcher.cpp
index f6e39523900..acb41abbadb 100644
--- a/config/src/vespa/config/helper/configfetcher.cpp
+++ b/config/src/vespa/config/helper/configfetcher.cpp
@@ -1,8 +1,8 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#include "configfetcher.h"
#include <vespa/log/log.h>
LOG_SETUP(".config.helper.configfetcher");
-#include "configfetcher.h"
namespace config {
diff --git a/config/src/vespa/config/helper/configfetcher.h b/config/src/vespa/config/helper/configfetcher.h
index ad7c2a8b549..ed04dc62f50 100644
--- a/config/src/vespa/config/helper/configfetcher.h
+++ b/config/src/vespa/config/helper/configfetcher.h
@@ -1,11 +1,10 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
+#include "configpoller.h"
#include <vespa/config/config.h>
#include <vespa/config/common/timingvalues.h>
#include <vespa/vespalib/util/thread.h>
-#include "configpoller.h"
-
#include <atomic>
namespace config {