diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 23:39:05 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
commit | 0b0e56d67df802eaa6c503edf6777b5e89625608 (patch) | |
tree | 3eb1658d9ff45225f76864d2b79da2a3af527d32 /storageapi | |
parent | 777943d3194383ab5492b285ae83dc3e92328514 (diff) |
split log and bufferedlog
Diffstat (limited to 'storageapi')
-rw-r--r-- | storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp | 8 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp index 1ad07387ba4..9d4d25d9d8e 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp @@ -13,14 +13,13 @@ #include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/removelocation.h> #include <vespa/vespalib/util/exceptions.h> - #include <vespa/vespalib/util/growablebytebuffer.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".storage.api.mbusprot.serialization.base"); -namespace storage { -namespace mbusprot { +namespace storage::mbusprot { ProtocolSerialization::ProtocolSerialization( const document::DocumentTypeRepo::SP& repo) @@ -299,5 +298,4 @@ ProtocolSerialization::decodeReply(mbus::BlobRef data, return StorageReply::UP(new StorageReply(SRep::SP(reply.release()))); } -} // mbusprot -} // storage +} diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp index 62a85e0f45e..87dcacb0fb9 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp @@ -5,12 +5,12 @@ #include "storagereply.h" #include <vespa/vespalib/util/exceptions.h> #include <vespa/document/util/stringutil.h> +#include <sstream> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".storage.api.mbusprot.protocol"); -namespace storage { -namespace mbusprot { +namespace storage::mbusprot { mbus::string StorageProtocol::NAME = "StorageProtocol"; @@ -169,5 +169,4 @@ StorageProtocol::decode(const vespalib::Version & version, return mbus::Routable::UP(); } -} // mbusprot -} // storage +} |