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

Merge remote-tracking branch 'origin/topic/bernhard/input-threads-merge'

Browse source 
* origin/topic/bernhard/input-threads-merge:
  disable streaming reads from executed commands.
  automatically delete disabled input streams
  small documentation fixes
  Documentation
This commit is contained in:
Robin Sommer 2012-06-15 15:38:43 -07:00
commit 464732bfce
11 changed files with 406 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/input/Manager.cc
View file

@ -689,16 +689,14 @@ bool Manager::IsCompatibleType(BroType* t, bool atomic_only)
}
bool Manager::RemoveStream(const string &name)
bool Manager::RemoveStream(Stream *i)
{
Stream *i = FindStream(name);
if ( i == 0 )
return false; // not found
if ( i->removed )
{
reporter->Error("Stream %s is already queued for removal. Ignoring remove.", name.c_str());
reporter->Error("Stream %s is already queued for removal. Ignoring remove.", i->name.c_str());
return false;
}
@ -706,14 +704,24 @@ bool Manager::RemoveStream(const string &name)
i->reader->Close();
#ifdef DEBUG
DBG_LOG(DBG_INPUT, "Successfully queued removal of stream %s",
name.c_str());
#endif
DBG_LOG(DBG_INPUT, "Successfully queued removal of stream %s",
i->name.c_str());
return true;
}
bool Manager::RemoveStream(ReaderFrontend* frontend)
{
return RemoveStream(FindStream(frontend));
}
bool Manager::RemoveStream(const string &name)
{
return RemoveStream(FindStream(name));
}
bool Manager::RemoveStreamContinuation(ReaderFrontend* reader)
{
Stream *i = FindStream(reader);