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

Adding options to enable/disable local and remote logging.

Browse source 
Only the local option has an effect right now.

Also moving Log::default_writer out of the bif into logging.bro.
This commit is contained in:
Robin Sommer 2011-02-28 22:21:53 -08:00
parent d673c8c64c
commit c355f5d1fa
4 changed files with 58 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/LogMgr.cc
View file

@ -27,6 +27,8 @@ struct LogMgr::Filter {
string path;
Val* path_val;
EnumVal* writer;
bool local;
bool remote;
int num_fields;
LogField** fields;
@ -260,14 +262,7 @@ bool LogMgr::AddFilter(EnumVal* id, RecordVal* fval)
// Find the right writer type.
int writer = 0;
int idx = rtype->FieldOffset("writer");
Val* writer_val = fval->Lookup(idx);
if ( ! writer_val )
// Use default.
writer = BifConst::Log::default_writer->AsEnum();
else
writer = writer_val->AsEnum();
writer = fval->LookupWithDefault(idx)->AsEnum();
// Create a new Filter instance.
@ -279,6 +274,8 @@ bool LogMgr::AddFilter(EnumVal* id, RecordVal* fval)
filter->pred = pred ? pred->AsFunc() : 0;
filter->path_func = path_func ? path_func->AsFunc() : 0;
filter->writer = id->Ref()->AsEnumVal();
filter->local = fval->LookupWithDefault(rtype->FieldOffset("log_local"))->AsBool();
filter->remote = fval->LookupWithDefault(rtype->FieldOffset("log_remote"))->AsBool();
// TODO: Check that the predciate is of the right type.
@ -426,6 +423,10 @@ bool LogMgr::Write(EnumVal* id, RecordVal* columns)
#endif
}
if ( ! filter->local )
// Skip the subsequent local logging code.
continue;
// See if we already have a writer for this path.
Stream::WriterMap::iterator w = stream->writers.find(Stream::WriterPathPair(filter->writer->AsEnum(), path));