diff --git a/CHANGES b/CHANGES index f4ecfc32be..8a882697fd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.2.0-dev.817 | 2020-06-29 19:23:21 +0000 + + * GH-1036: change print.log to log network time instead of current (Jon Siwek, Corelight) + 3.2.0-dev.815 | 2020-06-29 10:25:05 -0700 * reduce memory usage of ConnPolling (Justin Azoff) diff --git a/VERSION b/VERSION index b1f6fccba4..9ff32f087f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.815 +3.2.0-dev.817 diff --git a/doc b/doc index 04d72500bf..e738208f9c 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 04d72500bfed53059aa06d26a826a501b87ae29c +Subproject commit e738208f9c4c385b42de7066a71de0a2bcf52ec6 diff --git a/scripts/base/frameworks/logging/main.zeek b/scripts/base/frameworks/logging/main.zeek index b318cd0151..924fecd498 100644 --- a/scripts/base/frameworks/logging/main.zeek +++ b/scripts/base/frameworks/logging/main.zeek @@ -80,7 +80,7 @@ export { ## If :zeek:see:`Log::print_to_log` is set to redirect, ``print`` statements will ## automatically populate log entries with the fields contained in this record. type PrintLogInfo: record { - ## Current timestamp. + ## The network time at which the print statement was executed. ts: time &log; ## Set of strings passed to the print statement. vals: string_vec &log; diff --git a/src/Stmt.cc b/src/Stmt.cc index b0ef9c4ab7..00fab5776c 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -215,7 +215,7 @@ static void print_log(const std::vector>& vals) vec->Assign(vec->Size(), make_intrusive(d.Description())); } - record->Assign(0, make_intrusive(current_time())); + record->Assign(0, make_intrusive(network_time)); record->Assign(1, std::move(vec)); log_mgr->Write(plval.get(), record.get()); }