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

Merge remote-tracking branch 'origin/topic/johanna/bit-1181'

Browse source 
BIT-1181 #merged

* origin/topic/johanna/bit-1181:
  Input: Further small changes to error handling
  Add error events to input framework.
This commit is contained in:
Robin Sommer 2016-07-26 14:48:23 -07:00
commit 5b73345b73
33 changed files with 599 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/logging/WriterBackend.h
View file

@ -38,7 +38,7 @@ public:
* @param name A descriptive name for writer's type (e.g., \c Ascii).
*
*/
WriterBackend(WriterFrontend* frontend);
explicit WriterBackend(WriterFrontend* frontend);
/**
* Destructor.
@ -248,8 +248,12 @@ public:
bool FinishedRotation();
// Overridden from MsgThread.
virtual bool OnHeartbeat(double network_time, double current_time);
virtual bool OnFinish(double network_time);
bool OnHeartbeat(double network_time, double current_time) override;
bool OnFinish(double network_time) override;
// Let the compiler know that we are aware that there is a virtual
// info function in the base.
using MsgThread::Info;
protected:
friend class FinishMessage;