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

Implemented removing of log filters.

Browse source
This commit is contained in:
Robin Sommer 2011-02-21 16:45:35 -08:00
parent a798200dbf
commit 28216c84a2
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TODO.logging
View file

@ -1,6 +1,5 @@
List of the things not implemented yet: List of the things not implemented yet:
- Removing filters
- Dynamic path function. - Dynamic path function.
- Cluster-style remote_print - Cluster-style remote_print
- Rotation support - Rotation support

30
src/LogMgr.cc
View file

@ -179,13 +179,16 @@ bool LogMgr::AddFilter(EnumVal* stream_id, RecordVal* fval)
return false; return false;
} }
Stream* stream = streams[stream_id->AsEnum()]; unsigned int i = stream_id->AsEnum();
if ( ! stream )
if ( i >= streams.size() || ! streams[i] )
{ {
run_time("undefined log stream"); run_time("unknown log stream");
return false; return false;
} }
Stream* stream = streams[i];
// Find the right writer type. // Find the right writer type.
int writer = 0; int writer = 0;
int idx = rtype->FieldOffset("writer"); int idx = rtype->FieldOffset("writer");
@ -307,8 +310,7 @@ bool LogMgr::AddFilter(EnumVal* stream_id, RecordVal* fval)
bool LogMgr::RemoveFilter(EnumVal* stream_id, StringVal* filter) bool LogMgr::RemoveFilter(EnumVal* stream_id, StringVal* filter)
{ {
#if 0 unsigned int idx = stream_id->AsEnum();
int idx = stream_id->AsEnum();
if ( idx >= streams.size() || ! streams[idx] ) if ( idx >= streams.size() || ! streams[idx] )
{ {
@ -316,8 +318,24 @@ bool LogMgr::RemoveFilter(EnumVal* stream_id, StringVal* filter)
return false; return false;
} }
Stream* stream = streams[idx];
#endif string name = filter->AsString()->CheckString();
for ( list<Filter*>::iterator i = stream->filters.begin(); i != stream->filters.end(); ++i )
{
if ( (*i)->name == name )
{
Filter* filter = *i;
stream->filters.erase(i);
DBG_LOG(DBG_LOGGING, "Removed filter '%s' from stream '%s'", filter->name.c_str(), stream->name.c_str());
delete filter;
return true;
}
}
// If we don't find the filter, we don't treat that as an error.
DBG_LOG(DBG_LOGGING, "Did not find filter '%s' for removing from stream '%s'", name.c_str(), stream->name.c_str());
return true; return true;
} }