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

Merge branch 'master' into topic/jsiwek/filter-rotation

Browse source
This commit is contained in:
Jon Siwek 2011-09-08 13:01:00 -05:00
commit d8c716ae17
46 changed files with 464 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/LogMgr.cc
View file

@ -455,7 +455,7 @@ LogMgr::WriterInfo* LogMgr::FindWriter(LogWriter* writer)
{
WriterInfo* winfo = i->second;
if ( winfo->writer == writer )
if ( winfo && winfo->writer == writer )
return winfo;
}
}
@ -1532,7 +1532,8 @@ bool LogMgr::FinishedRotation(LogWriter* writer, string new_name, string old_nam
writer->Path().c_str(), network_time, new_name.c_str());
WriterInfo* winfo = FindWriter(writer);
assert(winfo);
if ( ! winfo )
return true;
RecordVal* rc =
LookupRotationControl(winfo->type, winfo->writer->Path());