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

Removing some no longer needed checks.

Browse source
This commit is contained in:
Robin Sommer 2012-03-08 17:16:51 -08:00
parent c0678e7e1f
commit bf14bd91d7
1 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/logging/Manager.cc
View file

@ -105,9 +105,6 @@ Manager::Stream::~Stream()
{ {
WriterInfo* winfo = i->second; WriterInfo* winfo = i->second;
if ( ! winfo )
continue;
if ( winfo->rotation_timer ) if ( winfo->rotation_timer )
timer_mgr->Cancel(winfo->rotation_timer); timer_mgr->Cancel(winfo->rotation_timer);
@ -207,7 +204,7 @@ Manager::WriterInfo* Manager::FindWriter(WriterFrontend* writer)
{ {
WriterInfo* winfo = i->second; WriterInfo* winfo = i->second;
if ( winfo && winfo->writer == writer ) if ( winfo->writer == writer )
return winfo; return winfo;
} }
} }
@ -221,7 +218,7 @@ void Manager::RemoveDisabledWriters(Stream* stream)
for ( Stream::WriterMap::iterator j = stream->writers.begin(); j != stream->writers.end(); j++ ) for ( Stream::WriterMap::iterator j = stream->writers.begin(); j != stream->writers.end(); j++ )
{ {
if ( j->second && j->second->writer->Disabled() ) if ( j->second->writer->Disabled() )
{ {
j->second->writer->Stop(); j->second->writer->Stop();
delete j->second; delete j->second;
@ -740,7 +737,7 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
if ( w != stream->writers.end() ) if ( w != stream->writers.end() )
// We know this writer already. // We know this writer already.
writer = w->second ? w->second->writer : 0; writer = w->second->writer;
else else
{ {
@ -948,7 +945,7 @@ WriterFrontend* Manager::CreateWriter(EnumVal* id, EnumVal* writer, string path,
Stream::WriterMap::iterator w = Stream::WriterMap::iterator w =
stream->writers.find(Stream::WriterPathPair(writer->AsEnum(), path)); stream->writers.find(Stream::WriterPathPair(writer->AsEnum(), path));
if ( w != stream->writers.end() && w->second ) if ( w != stream->writers.end() )
// If we already have a writer for this. That's fine, we just // If we already have a writer for this. That's fine, we just
// return it. // return it.
return w->second->writer; return w->second->writer;
@ -1050,7 +1047,6 @@ bool Manager::Write(EnumVal* id, EnumVal* writer, string path, int num_fields,
return false; return false;
} }
if ( w->second )
w->second->writer->Write(num_fields, vals); w->second->writer->Write(num_fields, vals);
DBG_LOG(DBG_LOGGING, DBG_LOG(DBG_LOGGING,
@ -1072,9 +1068,6 @@ void Manager::SendAllWritersTo(RemoteSerializer::PeerID peer)
for ( Stream::WriterMap::iterator i = stream->writers.begin(); for ( Stream::WriterMap::iterator i = stream->writers.begin();
i != stream->writers.end(); i++ ) i != stream->writers.end(); i++ )
{ {
if ( ! i->second )
continue;
WriterFrontend* writer = i->second->writer; WriterFrontend* writer = i->second->writer;
EnumVal writer_val(i->first.first, BifType::Enum::Log::Writer); EnumVal writer_val(i->first.first, BifType::Enum::Log::Writer);
@ -1095,10 +1088,7 @@ bool Manager::SetBuf(EnumVal* id, bool enabled)
for ( Stream::WriterMap::iterator i = stream->writers.begin(); for ( Stream::WriterMap::iterator i = stream->writers.begin();
i != stream->writers.end(); i++ ) i != stream->writers.end(); i++ )
{
if ( i->second )
i->second->writer->SetBuf(enabled); i->second->writer->SetBuf(enabled);
}
RemoveDisabledWriters(stream); RemoveDisabledWriters(stream);
@ -1116,10 +1106,7 @@ bool Manager::Flush(EnumVal* id)
for ( Stream::WriterMap::iterator i = stream->writers.begin(); for ( Stream::WriterMap::iterator i = stream->writers.begin();
i != stream->writers.end(); i++ ) i != stream->writers.end(); i++ )
{
if ( i->second )
i->second->writer->Flush(); i->second->writer->Flush();
}
RemoveDisabledWriters(stream); RemoveDisabledWriters(stream);