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

Move a few of the zeek::util methods and variables to zeek::util::detail

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-06 15:45:42 -07:00
parent 5a2ac84eee
commit ddf48d7529
35 changed files with 1221 additions and 1226 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/logging/Manager.cc
View file

@ -1215,7 +1215,7 @@ WriterFrontend* Manager::CreateWriter(zeek::EnumVal* id, zeek::EnumVal* writer,
static auto base_time = log_rotate_base_time->AsString()->CheckString();
winfo->info->rotation_interval = winfo->interval;
winfo->info->rotation_base = zeek::util::parse_rotate_base_time(base_time);
winfo->info->rotation_base = zeek::util::detail::parse_rotate_base_time(base_time);
winfo->writer = new WriterFrontend(*winfo->info, id, writer, local, remote);
winfo->writer->Init(num_fields, fields);
@ -1474,9 +1474,9 @@ void Manager::InstallRotationTimer(WriterInfo* winfo)
static auto log_rotate_base_time = zeek::id::find_val<zeek::StringVal>("log_rotate_base_time");
static auto base_time = log_rotate_base_time->AsString()->CheckString();
double base = zeek::util::parse_rotate_base_time(base_time);
double base = zeek::util::detail::parse_rotate_base_time(base_time);
double delta_t =
zeek::util::calc_next_rotate(zeek::net::network_time, rotation_interval, base);
zeek::util::detail::calc_next_rotate(zeek::net::network_time, rotation_interval, base);
winfo->rotation_timer =
new RotationTimer(zeek::net::network_time + delta_t, winfo, true);
@ -1522,7 +1522,7 @@ std::string Manager::FormatRotationPath(zeek::EnumValPtr writer,
auto prefix = rp_val->GetField(1)->AsString()->CheckString();
auto dir = dir_val->AsString()->CheckString();
if ( ! zeek::util::streq(dir, "") && ! zeek::util::ensure_intermediate_dirs(dir) )
if ( ! zeek::util::streq(dir, "") && ! zeek::util::detail::ensure_intermediate_dirs(dir) )
{
zeek::reporter->Error("Failed to create dir '%s' returned by "
"Log::rotation_format_func for path %.*s: %s",