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

GH-1768: Properly cleanup existing log stream when recreated on with the same ID

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-12-03 13:46:22 -07:00
parent e7412e257f
commit d50dade24c
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logging/Manager.cc
View file

@ -311,8 +311,11 @@ bool Manager::CreateStream(EnumVal* id, RecordVal* sval)
streams.push_back(nullptr); streams.push_back(nullptr);
if ( streams[idx] ) if ( streams[idx] )
// We already know this one, delete the previous definition. {
delete streams[idx]; // We already know this one. Clean up the old version before making
// a new one.
RemoveStream(idx);
}
// Create new stream. // Create new stream.
streams[idx] = new Stream; streams[idx] = new Stream;
@ -334,7 +337,11 @@ bool Manager::CreateStream(EnumVal* id, RecordVal* sval)
bool Manager::RemoveStream(EnumVal* id) bool Manager::RemoveStream(EnumVal* id)
{ {
unsigned int idx = id->AsEnum(); unsigned int idx = id->AsEnum();
return RemoveStream(idx);
}
bool Manager::RemoveStream(unsigned int idx)
{
if ( idx >= streams.size() || ! streams[idx] ) if ( idx >= streams.size() || ! streams[idx] )
return false; return false;

2
src/logging/Manager.h
View file

@ -299,6 +299,8 @@ private:
bool CompareFields(const Filter* filter, const WriterFrontend* writer); bool CompareFields(const Filter* filter, const WriterFrontend* writer);
bool CheckFilterWriterConflict(const WriterInfo* winfo, const Filter* filter); bool CheckFilterWriterConflict(const WriterInfo* winfo, const Filter* filter);
bool RemoveStream(unsigned int idx);
std::vector<Stream*> streams; // Indexed by stream enum. std::vector<Stream*> streams; // Indexed by stream enum.
int rotations_pending; // Number of rotations not yet finished. int rotations_pending; // Number of rotations not yet finished.
FuncPtr rotation_format_func; FuncPtr rotation_format_func;