Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  No longer write to the PacketFilter::LOG stream if not reading traffic.
This commit is contained in:
Robin Sommer 2011-11-03 15:21:08 -07:00
commit 41a443677b
3 changed files with 8 additions and 2 deletions

View file

@ -1,4 +1,9 @@
2.0-beta-12 | 2011-11-03 15:21:08 -0700
* No longer write to the PacketFilter::LOG stream if not reading
traffic. (Seth Hall)
2.0-beta-10 | 2011-11-03 15:17:08 -0700 2.0-beta-10 | 2011-11-03 15:17:08 -0700
* Notice framework documentation update. (Seth Hall) * Notice framework documentation update. (Seth Hall)

View file

@ -1 +1 @@
2.0-beta-10 2.0-beta-12

View file

@ -144,7 +144,8 @@ function install()
$sub=default_filter]); $sub=default_filter]);
} }
Log::write(PacketFilter::LOG, info); if ( reading_live_traffic() || reading_traces() )
Log::write(PacketFilter::LOG, info);
} }
event bro_init() &priority=10 event bro_init() &priority=10