diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:38:06 +0200 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:38:06 +0200 |
| commit | d161b6bcb87566a31cb5e0700b84f968539f502f (patch) | |
| tree | cfbc4612f439510afffd8fc190bf7eeec2a52ae7 /storage | |
| parent | 2915ddaa1c176a47d6c62d3b25bad9bb369c1448 (diff) | |
move LOG_SETUP after other includes
Diffstat (limited to 'storage')
4 files changed, 11 insertions, 7 deletions
diff --git a/storage/src/tests/bucketdb/judymultimaptest.cpp b/storage/src/tests/bucketdb/judymultimaptest.cpp index 28504e3abed..43b83b16dec 100644 --- a/storage/src/tests/bucketdb/judymultimaptest.cpp +++ b/storage/src/tests/bucketdb/judymultimaptest.cpp @@ -1,7 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".judy_multi_map_test"); #include <vespa/storage/bucketdb/judymultimap.h> #include <vespa/storage/bucketdb/judymultimap.hpp> #include <vespa/vdstestlib/cppunit/macros.h> @@ -12,6 +10,9 @@ LOG_SETUP(".judy_multi_map_test"); #include <ostream> #include <vector> +#include <vespa/log/log.h> +LOG_SETUP(".judy_multi_map_test"); + namespace storage { struct JudyMultiMapTest : public CppUnit::TestFixture { diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp index 46928ee51ae..c94121062ec 100644 --- a/storage/src/tests/bucketdb/lockablemaptest.cpp +++ b/storage/src/tests/bucketdb/lockablemaptest.cpp @@ -1,7 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".lockable_map_test"); #include <vespa/vespalib/util/document_runnable.h> #include <vespa/storage/bucketdb/judymultimap.h> #include <vespa/storage/bucketdb/judymultimap.hpp> @@ -10,6 +8,9 @@ LOG_SETUP(".lockable_map_test"); #include <cppunit/extensions/HelperMacros.h> #include <boost/operators.hpp> +#include <vespa/log/log.h> +LOG_SETUP(".lockable_map_test"); + namespace storage { struct LockableMapTest : public CppUnit::TestFixture { diff --git a/storage/src/vespa/storage/bucketdb/storbucketdb.cpp b/storage/src/vespa/storage/bucketdb/storbucketdb.cpp index 83787bde55f..df9e8e4e5b5 100644 --- a/storage/src/vespa/storage/bucketdb/storbucketdb.cpp +++ b/storage/src/vespa/storage/bucketdb/storbucketdb.cpp @@ -1,9 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "storbucketdb.h" +#include "judymultimap.hpp" + #include <vespa/log/log.h> LOG_SETUP(".storage.bucketdb.stor_bucket_db"); -#include "judymultimap.hpp" namespace storage { namespace bucketdb { diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp index 822cb0b16ae..b47b3b59b4f 100644 --- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp +++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bucketmover.h" -#include <vespa/log/bufferedlogger.h> -LOG_SETUP(".bucketmover"); #include "htmltable.h" #include <vespa/storage/config/config-stor-server.h> #include <vespa/storage/common/bucketmessages.h> @@ -14,6 +12,9 @@ LOG_SETUP(".bucketmover"); #include <vespa/document/bucket/fixed_bucket_spaces.h> #include <thread> +#include <vespa/log/bufferedlogger.h> +LOG_SETUP(".bucketmover"); + namespace storage::bucketmover { BucketMover::BucketMover(const config::ConfigUri & configUri, |