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

Merge remote-tracking branch 'origin/topic/dnthayer/ticket1595'

Browse source 
* origin/topic/dnthayer/ticket1595:
  Fix a bug in receiving remote logs via broker

BIT-1595 #merged
This commit is contained in:
Johanna Amann 2016-05-12 08:04:33 -07:00
commit 49ca47895d
6 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
testing/btest/Baseline/broker.remote_log/recv.recv.out
View file

@ -1,6 +1,6 @@
wrote log, [msg=ping, num=0, nolog=no]
wrote log, [msg=ping, num=1, nolog=no]
wrote log, [msg=ping, num=2, nolog=no]
wrote log, [msg=ping, num=3, nolog=no]
wrote log, [msg=ping, num=4, nolog=no]
wrote log, [msg=ping, num=5, nolog=no]
wrote log, [msg=ping, nolog=no, num=0]
wrote log, [msg=ping, nolog=no, num=1]
wrote log, [msg=ping, nolog=no, num=2]
wrote log, [msg=ping, nolog=no, num=3]
wrote log, [msg=ping, nolog=no, num=4]
wrote log, [msg=ping, nolog=no, num=5]

2
testing/btest/broker/remote_log.test
View file

@ -19,8 +19,8 @@ export {
type Info: record {
msg: string &log;
num: count &log;
nolog: string &default="no";
num: count &log;
};
global log_test: event(rec: Test::Info);