split log and bufferedlog

59 files changed, 85 insertions, 119 deletions

diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index db05ea16488..c352f0ee5ab 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -13,8 +13,9 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/log/log.h>
+#include <sstream>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".metrics.manager");
 
 namespace metrics {
diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
index 835c06db3cf..7966a705802 100644
--- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
+++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
@@ -8,7 +8,7 @@
 #include <vespa/fastos/app.h>
 #include <iostream>
 #include <algorithm>
-#include <string>
+#include <sstream>
 #include <openssl/sha.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
index d54603fd898..51cb9a17b5b 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
@@ -20,6 +20,7 @@
 
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <vespa/searchlib/attribute/changevector.hpp>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".attrupdate");
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 67a02c5d3ee..0253e943883 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -10,6 +10,7 @@
 #include <vespa/searchlib/docstore/logdocumentstore.h>
 #include <vespa/searchsummary/docsummary/docsumconfig.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.docsummary.summarymanager");
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
index ed029751271..2244759e866 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
@@ -3,6 +3,7 @@
 #include "prepare_restart_flush_strategy.h"
 #include "flush_target_candidates.h"
 #include "tls_stats_map.h"
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.flushengine.prepare_restart_flush_strategy");
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
index 0cc6823f300..60f35934831 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
@@ -3,7 +3,7 @@
 #include "clusterstatehandler.h"
 #include "iclusterstatechangedhandler.h"
 #include <vespa/vespalib/util/closuretask.h>
-#include <algorithm>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.clusterstatehandler");
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index 2b8209d9e4e..b444cd99952 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -10,9 +10,10 @@
 #include <vespa/config-summarymap.h>
 #include <vespa/config-rank-profiles.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
-#include <fstream>
 #include <vespa/fastos/file.h>
 #include <vespa/config/helper/configgetter.hpp>
+#include <fstream>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.fileconfigmanager");
diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
index a7e2d5738ce..b96b2b4ff05 100644
--- a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
+++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
@@ -12,6 +12,7 @@
 #include <vespa/searchlib/diskindex/pagedict4randread.h>
 #include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/fastos/app.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("pagedict4test");
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index 3719c5da1c7..b4285da447b 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -9,6 +9,7 @@
 #include <vespa/fastos/app.h>
 #include <iostream>
 #include <stdexcept>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("translogstress");
diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
index 5ebe6bdeefe..ea66a3435d1 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp
@@ -3,18 +3,14 @@
 
 #include "fusion.h"
 #include "fieldreader.h"
-#include "fieldwriter.h"
 #include "dictionarywordreader.h"
 #include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/searchlib/common/fslimits.h>
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/searchlib/util/dirtraverse.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/common/documentsummary.h>
-#include <vespa/searchlib/common/tunefileinfo.h>
-#include <vespa/searchlib/index/postinglistparams.h>
-#include <vespa/searchlib/util/postingpriorityqueue.h>
 #include <vespa/vespalib/util/error.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".diskindex.fusion");
diff --git a/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp b/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
index 92d00e9f907..924318a4a5a 100644
--- a/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/nativerankfeature.cpp
@@ -3,8 +3,8 @@
 #include "nativerankfeature.h"
 #include "valuefeature.h"
 #include "utils.h"
-#include <vespa/searchlib/fef/fieldinfo.h>
 #include <vespa/searchlib/fef/properties.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".features.nativerankfeature");
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
index 9bf87ecac1a..b3b5f80a4a2 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
@@ -2,14 +2,12 @@
 
 #include "fakewordset.h"
 #include "fakeword.h"
-#include <vespa/searchlib/index/schemautil.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".fakewordset");
 
-namespace search {
-
-namespace fakedata {
+namespace search::fakedata {
 
 using index::PostingListParams;
 using index::SchemaUtil;
@@ -146,7 +144,6 @@ FakeWordSet::getNumWords()
     return ret;
 }
 
-
 void
 FakeWordSet::addDocIdBias(uint32_t docIdBias)
 {
@@ -154,7 +151,4 @@ FakeWordSet::addDocIdBias(uint32_t docIdBias)
         applyDocIdBiasToVector(_words[i], docIdBias);
 }
 
-
-} // namespace fakedata
-
-} // namespace search
+}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
index 8760a12fb82..4e11bbcd979 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
@@ -2,17 +2,14 @@
 
 #include "juniperdfw.h"
 #include "docsumwriter.h"
-#include "docsumfieldwriter.h"
 #include "docsumstate.h"
-#include "keywordextractor.h"
-#include "docsumformat.h"
 #include <vespa/searchlib/parsequery/stackdumpiterator.h>
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchlib/queryeval/split_float.h>
-
 #include <vespa/searchlib/fef/properties.h>
 #include <vespa/vespalib/objects/hexdump.h>
 #include <vespa/juniper/config.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.dynamicteaserdfw");
diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp
index 577bf6f59a1..b645f79efa4 100644
--- a/slobrok/src/tests/startsome/tstdst.cpp
+++ b/slobrok/src/tests/startsome/tstdst.cpp
@@ -6,6 +6,7 @@
 #include <vespa/fnet/frt/invoker.h>
 #include <vespa/fnet/transport.h>
 #include <vespa/fnet/frt/target.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("testrpcserver");
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
index 18fc5efb4b5..79150c160d5 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
@@ -19,8 +19,8 @@
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/config/config.h>
 #include <unordered_map>
-#include <vespa/log/log.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".storage.bucketdb.manager");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/bucketdb/distribution_hash_normalizer.cpp b/storage/src/vespa/storage/bucketdb/distribution_hash_normalizer.cpp
index 80f82e65a9a..39e45e1b541 100644
--- a/storage/src/vespa/storage/bucketdb/distribution_hash_normalizer.cpp
+++ b/storage/src/vespa/storage/bucketdb/distribution_hash_normalizer.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 "distribution_hash_normalizer.h"
-#include <vespa/log/log.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
@@ -13,6 +12,7 @@
 #include <iterator>
 #include <functional>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".storage.bucketdb.distribution_hash_normalizer");
 
 // TODO
diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp
index 178731469ba..49022db523b 100644
--- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp
+++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp
@@ -13,7 +13,7 @@
 #include <vespa/config/helper/configgetter.hpp>
 #include <iomanip>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".storage.bucketdb.initializer");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
index bda0a394802..b38c061de44 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
@@ -8,10 +8,10 @@
 #include <vespa/storage/storageutil/log.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".bucketmover");
 
-namespace storage {
-namespace bucketmover {
+namespace storage::bucketmover {
 
 BucketMover::BucketMover(const config::ConfigUri & configUri,
                          ServiceLayerComponentRegister& reg)
@@ -526,5 +526,4 @@ BucketMover::printRunStatisticsHtml(std::ostream& out,
     rs.print(out, true, "");
 }
 
-} // bucketmover
-} // storage
+}
diff --git a/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp b/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp
index 66eb891840e..76a38e3e730 100644
--- a/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp
+++ b/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp
@@ -1,13 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "cpureporter.h"
 #include "kernelmetrictool.h"
-
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
-#include <array>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".cpureporter");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/common/storagelink.cpp b/storage/src/vespa/storage/common/storagelink.cpp
index d3b6370347b..50097b132f6 100644
--- a/storage/src/vespa/storage/common/storagelink.cpp
+++ b/storage/src/vespa/storage/common/storagelink.cpp
@@ -5,7 +5,7 @@
 #include <vespa/vespalib/util/backtrace.h>
 #include <sstream>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".application.link");
 
 using std::shared_ptr;
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp
index 10d135ccf2d..57e8c55c23b 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.cpp
+++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp
@@ -3,6 +3,7 @@
 #include <vespa/document/select/parser.h>
 #include <vespa/document/select/traversingvisitor.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".distributorconfiguration");
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index eede73bed63..9051bbac0f0 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -9,7 +9,7 @@
 #include <vespa/storageapi/message/multioperation.h>
 #include <vespa/vespalib/util/xmlstream.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".distributor.bucketdb.updater");
 
 using storage::lib::Node;
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
index 29e65bfcc00..e2417ea1585 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
@@ -1,14 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "joinoperation.h"
-#include <vespa/storage/distributor/idealstatemanager.h>
-#include <vespa/storage/distributor/pendingmessagetracker.h>
-#include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
-#include <vespa/vdslib/state/clusterstate.h>
-
-#include <vespa/log/log.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".distributor.operation.idealstate.join");
 
 using namespace storage::distributor;
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
index 0821408560b..80a79a8cde9 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
@@ -2,7 +2,7 @@
 #include "mergeoperation.h"
 #include <vespa/storage/distributor/idealstatemanager.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".distributor.operation.idealstate.merge");
 
 namespace storage::distributor {
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
index 7601d7faa6d..a6986c62715 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
@@ -5,7 +5,7 @@
 #include <vespa/storage/common/bucketoperationlogger.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 
 LOG_SETUP(".distributor.operation.idealstate.split");
 
diff --git a/storage/src/vespa/storage/distributor/sentmessagemap.cpp b/storage/src/vespa/storage/distributor/sentmessagemap.cpp
index 7efbd3f55d2..02a6da98780 100644
--- a/storage/src/vespa/storage/distributor/sentmessagemap.cpp
+++ b/storage/src/vespa/storage/distributor/sentmessagemap.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 "sentmessagemap.h"
-
 #include <vespa/storage/distributor/operations/operation.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".distributor.callback.map");
diff --git a/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp b/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
index 883dc13cdb3..53967c1cae2 100644
--- a/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
@@ -6,9 +6,9 @@
 #include <vespa/storage/storageutil/piechart.h>
 #include <vespa/metrics/metricmanager.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
+#include <sstream>
 
-#include <vespa/log/log.h>
-
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".memory.status.viewer");
 
 using storage::framework::defaultimplementation::MemoryState;
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index 00dce18e084..045a7514928 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/util/host_name.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/component/vtag.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".status");
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
index 2861ab904ff..3d9586ea398 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
@@ -5,7 +5,7 @@
 #include <vespa/storage/bucketmover/htmltable.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".deadlock.detector");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp b/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
index b26c6ec893f..0a173b2945c 100644
--- a/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
+++ b/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
@@ -7,7 +7,7 @@
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/util/backtrace.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.bucketownershipnotifier");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 43d5de4a5a0..128eff61436 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -19,6 +19,7 @@
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/util/stringfmt.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.filestor.manager");
 
 using std::shared_ptr;
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 10a5a7505dd..011c6ecc1b0 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -11,7 +11,8 @@
 #include <vespa/document/fieldset/fieldsetrepo.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/log/log.h>
+
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.thread");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/persistence/persistenceutil.cpp b/storage/src/vespa/storage/persistence/persistenceutil.cpp
index 2d8a8561ba6..202a7c5cac5 100644
--- a/storage/src/vespa/storage/persistence/persistenceutil.cpp
+++ b/storage/src/vespa/storage/persistence/persistenceutil.cpp
@@ -4,7 +4,7 @@
 #include <vespa/config/config.h>
 #include <vespa/config/helper/configgetter.hpp>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.util");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/persistence/splitbitdetector.cpp b/storage/src/vespa/storage/persistence/splitbitdetector.cpp
index 62039f36133..cf3fde77b2b 100644
--- a/storage/src/vespa/storage/persistence/splitbitdetector.cpp
+++ b/storage/src/vespa/storage/persistence/splitbitdetector.cpp
@@ -1,11 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/storage/persistence/splitbitdetector.h>
-#include <vespa/storage/persistence/bucketprocessor.h>
+#include "splitbitdetector.h"
+#include "bucketprocessor.h"
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/document/base/documentid.h>
+#include <sstream>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.split.bitdetector");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/storageserver/bouncer.cpp b/storage/src/vespa/storage/storageserver/bouncer.cpp
index 6ea898c344c..c285645309a 100644
--- a/storage/src/vespa/storage/storageserver/bouncer.cpp
+++ b/storage/src/vespa/storage/storageserver/bouncer.cpp
@@ -1,9 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "bouncer.h"
-
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storageapi/message/persistence.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".bouncer");
diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
index 14b6adcb9a4..05b581d839a 100644
--- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
+++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
@@ -7,10 +7,10 @@
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vdslib/distribution/distribution.h>
-#include <vespa/config/config.h>
 #include <vespa/storage/bucketdb/lockablemap.hpp>
 #include <vespa/vespalib/util/exceptions.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".bucketintegritychecker");
 
 using std::shared_ptr;
diff --git a/storage/src/vespa/storage/storageserver/changedbucketownershiphandler.cpp b/storage/src/vespa/storage/storageserver/changedbucketownershiphandler.cpp
index 27261424894..fa5f189420e 100644
--- a/storage/src/vespa/storage/storageserver/changedbucketownershiphandler.cpp
+++ b/storage/src/vespa/storage/storageserver/changedbucketownershiphandler.cpp
@@ -4,10 +4,9 @@
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storage/common/messagebucketid.h>
-#include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/vespalib/util/exceptions.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".bucketownershiphandler");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 1c93cefefbc..f32b1c242cf 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -10,8 +10,8 @@
 #include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
-#include <vespa/log/log.h>
 
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".communication.manager");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.cpp b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
index 5bbeba4aa16..7daf2fb4777 100644
--- a/storage/src/vespa/storage/storageserver/fnetlistener.cpp
+++ b/storage/src/vespa/storage/storageserver/fnetlistener.cpp
@@ -5,6 +5,7 @@
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/host_name.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 
diff --git a/storage/src/vespa/storage/storageserver/opslogger.cpp b/storage/src/vespa/storage/storageserver/opslogger.cpp
index 2a4465c62bc..f770fc0af51 100644
--- a/storage/src/vespa/storage/storageserver/opslogger.cpp
+++ b/storage/src/vespa/storage/storageserver/opslogger.cpp
@@ -2,6 +2,7 @@
 
 #include "opslogger.h"
 #include <vespa/storageapi/message/persistence.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".operationslogger");
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index 6940706e211..aff3cb0725a 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -12,6 +12,7 @@
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <unordered_map>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".visitor.instance");
diff --git a/storage/src/vespa/storage/visiting/visitormanager.cpp b/storage/src/vespa/storage/visiting/visitormanager.cpp
index 0df82dad80f..5e1f8b4df79 100644
--- a/storage/src/vespa/storage/visiting/visitormanager.cpp
+++ b/storage/src/vespa/storage/visiting/visitormanager.cpp
@@ -11,6 +11,7 @@
 #include <vespa/storage/common/statusmessages.h>
 #include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".visitor.manager");
diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp
index e57bcebf372..aeea3c7ba8e 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthread.cpp
@@ -14,10 +14,11 @@
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/document/base/exceptions.h>
-#include <locale>
 #include <vespa/vespalib/stllike/hash_map.hpp>
-#include <vespa/log/log.h>
+#include <locale>
+#include <sstream>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".visitor.thread");
 
 using storage::api::ReturnCode;
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
+}
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp
index 125e01db179..a19851ae01f 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp
@@ -1,13 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "memorystate.h"
+#include <sstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".memory.state");
 
-namespace storage {
-namespace framework {
-namespace defaultimplementation {
+namespace storage::framework::defaultimplementation {
 
 MemoryState::Entry::Entry()
     : _currentUsedSize(0),
@@ -223,6 +222,4 @@ MemoryState::print(std::ostream& out, bool verbose,
     out << "\n" << indent << "}";
 }
 
-} // defaultimplementation
-} // framework
-} // storage
+}
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp
index 55723eec558..5d5d0b97541 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp
@@ -1,15 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "simplememorylogic.h"
-
 #include <vespa/vespalib/util/exceptions.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".memory.logic.simple");
 
-namespace storage {
-namespace framework {
-namespace defaultimplementation {
+namespace storage::framework::defaultimplementation {
 
 SimpleMemoryLogic::SimpleMemoryLogic(Clock& c, uint64_t maxMemory)
     : _cacheThreshold(0.98),
@@ -232,6 +229,4 @@ SimpleMemoryLogic::print(std::ostream& out, bool verbose,
     _state.print(out, verbose, indent + "  ");
 }
 
-} // defaultimplementation
-} // framework
-} // storage
+}
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp
index 3e3785f67b1..eaa66fedc88 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp
@@ -4,7 +4,7 @@
 #include "threadpoolimpl.h"
 #include <vespa/storageframework/generic/clock/clock.h>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".framework.thread.impl");
 
 namespace storage::framework::defaultimplementation {
diff --git a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h
index f7229a1d297..2704f90d5f1 100644
--- a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h
+++ b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h
@@ -9,6 +9,7 @@
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <map>
+#include <sstream>
 
 namespace storage::framework {
 
diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
index a75ba591af5..cc099164306 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
@@ -13,11 +13,10 @@
 #include <vespa/config-stor-distribution.h>
 #include <list>
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".vdslib.distribution");
 
-namespace storage {
-namespace lib {
+namespace storage::lib {
 
 namespace {
     std::vector<uint32_t> getDistributionBitMasks() {
@@ -711,5 +710,4 @@ Distribution::splitNodesIntoLeafGroups(IndexList nodeList) const
     return result;
 }
 
-} // lib
-} // storage
+}
diff --git a/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp b/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp
index 7ea270eb306..b1be394b65f 100644
--- a/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp
+++ b/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp
@@ -1,11 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-
-
 #include <vespa/document/util/stringutil.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/slobrok/sbmirror.h>
-#include <iostream>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vespalib/util/programoptions.h>
@@ -14,6 +11,8 @@
 #include <vespa/config-stor-distribution.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <vespa/fastos/app.h>
+#include <sstream>
+#include <iostream>
 
 #include <vespa/log/log.h>
 LOG_SETUP("vdsstatetool");
diff --git a/vespalog/src/test/bufferedlogskiptest.cpp b/vespalog/src/test/bufferedlogskiptest.cpp
index 5b386d18e90..cb16b73fa24 100644
--- a/vespalog/src/test/bufferedlogskiptest.cpp
+++ b/vespalog/src/test/bufferedlogskiptest.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/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 
 #include <fstream>
 #include <iostream>
-#include <sstream>
-
-#include <sys/types.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 
-LOG_SETUP("bufferedlogskiptest",
-          "$Id$");
+LOG_SETUP("bufferedlogskiptest");
 
 std::string readFile(const std::string& file) {
     std::ostringstream ost;
diff --git a/vespalog/src/test/bufferedlogtest.cpp b/vespalog/src/test/bufferedlogtest.cpp
index 0e27bd65988..97f70ebe004 100644
--- a/vespalog/src/test/bufferedlogtest.cpp
+++ b/vespalog/src/test/bufferedlogtest.cpp
@@ -1,21 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 
 #include "bufferedlogtest.logger1.h"
 #include "bufferedlogtest.logger2.h"
 
 #include <fstream>
 #include <iostream>
-#include <sstream>
-
-#include <sys/types.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 
-LOG_SETUP("bufferedlogtest",
-          "$Id$");
+LOG_SETUP("bufferedlogtest");
 
 std::string readFile(const std::string& file) {
     std::ostringstream ost;
diff --git a/vespalog/src/test/bufferedlogtest.logger1.cpp b/vespalog/src/test/bufferedlogtest.logger1.cpp
index 992de19fea5..5af4b9489a4 100644
--- a/vespalog/src/test/bufferedlogtest.logger1.cpp
+++ b/vespalog/src/test/bufferedlogtest.logger1.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 #include "bufferedlogtest.logger1.h"
 
 LOG_SETUP(".logger1");
diff --git a/vespalog/src/test/bufferedlogtest.logger2.cpp b/vespalog/src/test/bufferedlogtest.logger2.cpp
index 688ecd153aa..ac6935c2c68 100644
--- a/vespalog/src/test/bufferedlogtest.logger2.cpp
+++ b/vespalog/src/test/bufferedlogtest.logger2.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 #include "bufferedlogtest.logger2.h"
 
 LOG_SETUP(".logger2");
diff --git a/vespalog/src/test/threads/testthreads.cpp b/vespalog/src/test/threads/testthreads.cpp
index 056f5aad2a2..90b8c13e497 100644
--- a/vespalog/src/test/threads/testthreads.cpp
+++ b/vespalog/src/test/threads/testthreads.cpp
@@ -2,7 +2,7 @@
 #include <vespa/fastos/app.h>
 #include <vespa/fastos/time.h>
 #include <vespa/fastos/thread.h>
-#include <vespa/log/log.h>
+#include <vespa/log/bufferedlogger.h>
 #include <iostream>
 
 using std::string;
diff --git a/vespalog/src/vespa/log/bufferedlogger.h b/vespalog/src/vespa/log/bufferedlogger.h
index 7ca8d799840..9ab02f7842f 100644
--- a/vespalog/src/vespa/log/bufferedlogger.h
+++ b/vespalog/src/vespa/log/bufferedlogger.h
@@ -198,7 +198,6 @@ public:
 
     /** Trim the buffer. Removing old messages if wanted. */
     void trimCache();
-
 };
 
 } // ns_log
diff --git a/vespalog/src/vespa/log/log.cpp b/vespalog/src/vespa/log/log.cpp
index 7e92008504e..c31d110d241 100644
--- a/vespalog/src/vespa/log/log.cpp
+++ b/vespalog/src/vespa/log/log.cpp
@@ -10,6 +10,7 @@ LOG_SETUP_INDIRECT(".log", "$Id$");
 #include "log-target.h"
 #include "internal.h"
 #include "control-file.h"
+#include "bufferedlogger.h"
 
 #include <vespa/fastos/thread.h>
 
@@ -222,6 +223,7 @@ Logger::doLog(LogLevel level, const char *file, int line, const char *fmt, ...)
         actualSize = tryLog(sizeofPayload, level, file, line, fmt, args);
         va_end(args);
     } while (sizeofPayload < actualSize);
+    ns_log::BufferedLogger::logger.trimCache();
 }
 
 void Logger::doLogCore(uint64_t timestamp, LogLevel level,
diff --git a/vespalog/src/vespa/log/log.h b/vespalog/src/vespa/log/log.h
index 6ecd69de792..53a0eec140c 100644
--- a/vespalog/src/vespa/log/log.h
+++ b/vespalog/src/vespa/log/log.h
@@ -38,14 +38,12 @@ static int log_dummmy __attribute__((unused)) = logger.setRcsId(x)
 do {                                                                          \
     if (logger.wants(ns_log::Logger::level)) {                                \
         logger.doLog(ns_log::Logger::level, __FILE__, __LINE__, __VA_ARGS__); \
-        ns_log::BufferedLogger::logger.trimCache();                           \
     }                                                                         \
 } while (0)
 #define VLOG(level, ...)                                      \
 do {                                                          \
     if (logger.wants(level)) {                                \
         logger.doLog(level, __FILE__, __LINE__, __VA_ARGS__); \
-        ns_log::BufferedLogger::logger.trimCache();           \
     }                                                         \
 } while (0)
 #endif
@@ -302,6 +300,3 @@ extern void log_abort(const char *message,
 #else
 #define LOG_ASSERT(expr)
 #endif // #ifndef NDEBUG
-
-#include <vespa/log/bufferedlogger.h>
-