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

(hopefully) fix mutex lock problem.

Browse source 
log writers were removed on shutdown while frontends still
had pointers to it.

A similar fix will be necessary for the input framework (tomorrow :) )
This commit is contained in:
Bernhard Amann 2013-05-17 14:08:43 -07:00
parent bd02da8a0c
commit 65b56479d2
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/logging/Manager.cc
View file

@ -1271,9 +1271,8 @@ bool Manager::Flush(EnumVal* id)
return true;
}
void Manager::FlushBuffers()
void Manager::Terminate()
{
// Flush out cached entries in Frontend
for ( vector<Stream *>::iterator s = streams.begin(); s != streams.end(); ++s )
{
if ( ! *s )
@ -1281,15 +1280,10 @@ void Manager::FlushBuffers()
for ( Stream::WriterMap::iterator i = (*s)->writers.begin();
i != (*s)->writers.end(); i++ )
i->second->writer->FlushWriteBuffer();
i->second->writer->Stop();
}
}
void Manager::Terminate()
{
FlushBuffers();
}
// Timer which on dispatching rotates the filter.
class RotationTimer : public Timer {
public: