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

Merge remote-tracking branch 'origin/master' into topic/bernhard/input-logging-commmon-functions

Browse source 
Conflicts:
	src/input/readers/Ascii.cc
This commit is contained in:
Bernhard Amann 2013-01-11 09:48:53 -08:00
commit 1b0bb5063a
66 changed files with 2367 additions and 564 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/frameworks/notice/cluster.bro
View file

@ -21,12 +21,10 @@ redef Cluster::manager2worker_events += /Notice::begin_suppression/;
redef Cluster::worker2manager_events += /Notice::cluster_notice/;
@if ( Cluster::local_node_type() != Cluster::MANAGER )
# The notice policy is completely handled by the manager and shouldn't be
# done by workers or proxies to save time for packet processing.
event bro_init() &priority=11
{
Notice::policy = table();
}
redef Notice::policy = table();
event Notice::begin_suppression(n: Notice::Info)
{