diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 15:49:46 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 15:50:29 +0100 |
| commit | 8400c8e39b6b08c6f61ba19662ee1844f3264ec7 (patch) | |
| tree | 085175b7c28a9181bce7e622c2bdd2e13ab1ff3a /storageserver | |
| parent | 51bc810507f2067ebd2646274d3cda5cb583a620 (diff) | |
Avoid pulling all of config everywhere.
Diffstat (limited to 'storageserver')
3 files changed, 6 insertions, 9 deletions
diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp index 8006c5e8471..fca37df0123 100644 --- a/storageserver/src/apps/storaged/storage.cpp +++ b/storageserver/src/apps/storaged/storage.cpp @@ -11,8 +11,6 @@ * application, but as little as possible else. */ -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <signal.h> #include <vespa/persistence/spi/exceptions.h> #include <vespa/storage/storageutil/utils.h> @@ -23,9 +21,11 @@ #include <vespa/storageserver/app/rpcservicelayerprocess.h> #include <vespa/vespalib/util/programoptions.h> #include <vespa/vespalib/util/shutdownguard.h> -#include <vespa/config/config.h> #include <iostream> +#include <vespa/config/helper/configgetter.hpp> +#include <vespa/fastos/app.h> +#include <vespa/log/log.h> LOG_SETUP("vds.application"); namespace storage { diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp index 80de17455d3..f1d58259879 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/storageserver/app/distributorprocess.h> +#include <vespa/config/helper/configgetter.hpp> #include <vespa/log/log.h> -#include <vespa/storage/storageutil/utils.h> - LOG_SETUP(".process.distributor"); namespace storage { diff --git a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp index cca173ba04d..c8b40be2404 100644 --- a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp @@ -1,10 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageserver/app/rpcservicelayerprocess.h> +#include "rpcservicelayerprocess.h" +#include <vespa/config/helper/configgetter.hpp> #include <vespa/log/log.h> - LOG_SETUP(".process.servicelayer"); namespace storage { |