From acfb21c5a6070f1366a127e49137bfe79b28df30 Mon Sep 17 00:00:00 2001 From: Vlad Grigorescu Date: Fri, 26 Mar 2021 15:26:48 -0500 Subject: [PATCH] Rename supervisor_rotation_format_func to archiver_rotation_format_func, and expose it for non-supervised setups Closes #1463 --- scripts/base/frameworks/cluster/nodes/logger.zeek | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/base/frameworks/cluster/nodes/logger.zeek b/scripts/base/frameworks/cluster/nodes/logger.zeek index 772d512658..1021cee100 100644 --- a/scripts/base/frameworks/cluster/nodes/logger.zeek +++ b/scripts/base/frameworks/cluster/nodes/logger.zeek @@ -22,11 +22,10 @@ redef Log::default_rotation_interval = 1 hrs; ## Alarm summary mail interval. redef Log::default_mail_alarms_interval = 24 hrs; -@if ( Supervisor::is_supervised() ) - -redef Log::default_rotation_dir = "log-queue"; - -function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath +## This function will rotate logs in a format compatible with zeek-archiver. +## If you're using the Supervisor framework, this function will be used, +## if not, you can set :zeek:see:`Log::rotation_format_func` to this function. +function archiver_rotation_format_func(ri: Log::RotationFmtInfo): Log::RotationPath { local open_str = strftime(Log::default_rotation_date_format, ri$open); local close_str = strftime(Log::default_rotation_date_format, ri$close); @@ -35,7 +34,11 @@ function supervisor_rotation_format_func(ri: Log::RotationFmtInfo): Log::Rotatio return rval; } -redef Log::rotation_format_func = supervisor_rotation_format_func; +@if ( Supervisor::is_supervised() ) + +redef Log::default_rotation_dir = "log-queue"; + +redef Log::rotation_format_func = archiver_rotation_format_func; redef LogAscii::enable_leftover_log_rotation = T;