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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-1036-print-log-network-time'

Browse source 
* origin/topic/jsiwek/gh-1036-print-log-network-time:
  GH-1036: change print.log to log network time instead of current

Fixes GH-1036
This commit is contained in:
Johanna Amann 2020-06-29 19:23:21 +00:00
commit a5a51de3c4
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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 3.2.0-dev.815 | 2020-06-29 10:25:05 -0700
* reduce memory usage of ConnPolling (Justin Azoff) * reduce memory usage of ConnPolling (Justin Azoff)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.815 3.2.0-dev.817

2
doc

@ -1 +1 @@
Subproject commit 04d72500bfed53059aa06d26a826a501b87ae29c Subproject commit e738208f9c4c385b42de7066a71de0a2bcf52ec6

2
scripts/base/frameworks/logging/main.zeek
View file

@ -80,7 +80,7 @@ export {
## If :zeek:see:`Log::print_to_log` is set to redirect, ``print`` statements will ## 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. ## automatically populate log entries with the fields contained in this record.
type PrintLogInfo: record { type PrintLogInfo: record {
## Current timestamp. ## The network time at which the print statement was executed.
ts: time &log; ts: time &log;
## Set of strings passed to the print statement. ## Set of strings passed to the print statement.
vals: string_vec &log; vals: string_vec &log;

2
src/Stmt.cc
View file

@ -215,7 +215,7 @@ static void print_log(const std::vector<IntrusivePtr<Val>>& vals)
vec->Assign(vec->Size(), make_intrusive<StringVal>(d.Description())); vec->Assign(vec->Size(), make_intrusive<StringVal>(d.Description()));
} }
record->Assign(0, make_intrusive<TimeVal>(current_time())); record->Assign(0, make_intrusive<TimeVal>(network_time));
record->Assign(1, std::move(vec)); record->Assign(1, std::move(vec));
log_mgr->Write(plval.get(), record.get()); log_mgr->Write(plval.get(), record.get());
} }