diff options
Diffstat (limited to 'storageserver')
4 files changed, 4 insertions, 19 deletions
diff --git a/storageserver/src/apps/storaged/forcelink.cpp b/storageserver/src/apps/storaged/forcelink.cpp index 2c628644e82..24d9d46d1df 100644 --- a/storageserver/src/apps/storaged/forcelink.cpp +++ b/storageserver/src/apps/storaged/forcelink.cpp @@ -1,6 +1,5 @@ // 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/document/base/forcelink.h> #include <vespa/documentapi/documentapi.h> #include <vespa/searchlib/aggregation/forcelink.hpp> diff --git a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp index c57d7667248..4b1b0169f31 100644 --- a/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/dummyservicelayerprocess.cpp @@ -1,11 +1,6 @@ // 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/dummyservicelayerprocess.h> - -#include <vespa/log/log.h> - -LOG_SETUP(".process.servicelayer"); +#include "dummyservicelayerprocess.h" namespace storage { diff --git a/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.cpp index c85a3af8a69..9e18d1a11ac 100644 --- a/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/memfileservicelayerprocess.cpp @@ -1,10 +1,8 @@ // 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/memfileservicelayerprocess.h> +#include "memfileservicelayerprocess.h" #include <vespa/log/log.h> - LOG_SETUP(".process.servicelayer"); namespace storage { diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp index 52f47531c78..5fd048d35c2 100644 --- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp @@ -1,18 +1,12 @@ // 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/servicelayerprocess.h> +#include "servicelayerprocess.h" -#include <vespa/log/log.h> #include <vespa/searchvisitor/searchvisitor.h> #include <vespa/storage/storageutil/utils.h> -LOG_SETUP(".process.servicelayer"); - namespace storage { -// ServiceLayerProcess implementation - ServiceLayerProcess::ServiceLayerProcess(const config::ConfigUri & configUri) : Process(configUri) { @@ -30,8 +24,7 @@ ServiceLayerProcess::createNode() { _externalVisitors["searchvisitor"].reset(new SearchVisitorFactory(_configUri)); setupProvider(); - _node.reset(new ServiceLayerNode( - _configUri, _context, *this, getProvider(), _externalVisitors)); + _node.reset(new ServiceLayerNode(_configUri, _context, *this, getProvider(), _externalVisitors)); _node->init(); } |