Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move logging code to zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:48:05 -07:00
parent 9a800265ff
commit 45b5c6e619
25 changed files with 135 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logging/writers/ascii/Ascii.cc
View file

@ -23,13 +23,14 @@
#include "ascii.bif.h"
using namespace std;
using namespace logging::writer;
using namespace threading;
using threading::Value;
using threading::Field;
static constexpr auto shadow_file_prefix = ".shadow.";
namespace zeek::logging::writer::detail {
/**
* Information about an leftover log file: that is, one that a previous
* process was in the middle of writing, but never completed a rotation
@ -190,7 +191,7 @@ static std::optional<LeftoverLog> parse_shadow_log(const std::string& fname)
return rval;
}
Ascii::Ascii(WriterFrontend* frontend) : WriterBackend(frontend)
Ascii::Ascii(zeek::logging::WriterFrontend* frontend) : zeek::logging::WriterBackend(frontend)
{
fd = 0;
ascii_done = false;
@ -783,8 +784,8 @@ void Ascii::RotateLeftoverLogs()
ll.filename.data(), ll.post_proc_func.data());
}
auto rotation_path = log_mgr->FormatRotationPath(
writer_val, ll.Path(), ll.open_time, ll.close_time, false, ppf);
auto rotation_path = zeek::log_mgr->FormatRotationPath(
writer_val, ll.Path(), ll.open_time, ll.close_time, false, ppf);
rotation_path += ll.extension;
@ -908,3 +909,5 @@ bool Ascii::InternalClose(int fd)
return false;
}
} // namespace zeek::logging::writer::detail