diff options
Diffstat (limited to 'logd/src')
-rw-r--r-- | logd/src/logd/empty_forwarder.cpp | 3 | ||||
-rw-r--r-- | logd/src/logd/watcher.cpp | 3 | ||||
-rw-r--r-- | logd/src/tests/watcher/watcher_test.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/logd/src/logd/empty_forwarder.cpp b/logd/src/logd/empty_forwarder.cpp index ca43950f56a..d571506df92 100644 --- a/logd/src/logd/empty_forwarder.cpp +++ b/logd/src/logd/empty_forwarder.cpp @@ -4,6 +4,7 @@ #include "metrics.h" #include <vespa/log/exceptions.h> #include <vespa/log/log_message.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/log/log.h> LOG_SETUP(".logd.empty_forwarder"); @@ -28,7 +29,7 @@ EmptyForwarder::~EmptyForwarder() = default; void EmptyForwarder::forwardLine(std::string_view line) { - assert (line.size() < 1024*1024); + assert (line.size() < 1_Mi); LogMessage message; try { diff --git a/logd/src/logd/watcher.cpp b/logd/src/logd/watcher.cpp index a91de132061..bfec9b82c2d 100644 --- a/logd/src/logd/watcher.cpp +++ b/logd/src/logd/watcher.cpp @@ -6,6 +6,7 @@ #include "watcher.h" #include <vespa/vespalib/util/sig_catch.h> #include <vespa/vespalib/util/time.h> +#include <vespa/vespalib/util/size_literals.h> #include <thread> #include <fcntl.h> #include <glob.h> @@ -29,7 +30,7 @@ void snooze(vespalib::Timer & timer) std::this_thread::sleep_for(1000ms - timer.elapsed()); } -constexpr size_t G_BUFSIZE = 1024*1024; +constexpr size_t G_BUFSIZE = 1_Mi; } // namespace logdemon::<unnamed> diff --git a/logd/src/tests/watcher/watcher_test.cpp b/logd/src/tests/watcher/watcher_test.cpp index f74564b23f4..2ba27091181 100644 --- a/logd/src/tests/watcher/watcher_test.cpp +++ b/logd/src/tests/watcher/watcher_test.cpp @@ -7,6 +7,7 @@ #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/vespalib/util/lambdatask.h> +#include <vespa/vespalib/util/size_literals.h> #include <fstream> #include <regex> #include <thread> @@ -127,7 +128,7 @@ public: }; WatcherTest::WatcherTest() - : _executor(1, 256 * 1024) + : _executor(1, 256_Ki) { remove_files(); setenv("VESPA_LOG_TARGET", "file:vespa.log", true); |