mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Merge remote branch 'origin/topic/robin/reporting'
* origin/topic/robin/reporting: Syslog BiF now goes through the reporter as well. Avoiding infinite loops when an error message handlers triggers errors itself. Renaming the Logger to Reporter. Overhauling the internal reporting of messages to the user. Updating a bunch of tests/baselines as well. Conflicts: aux/broccoli policy.old/alarm.bro policy/all.bro policy/bro.init policy/frameworks/notice/weird.bro policy/notice.bro src/SSL-binpac.cc src/bro.bif src/main.cc
This commit is contained in:
commit
9709b1d522
152 changed files with 2625 additions and 1134 deletions
|
@ -36,8 +36,13 @@ public:
|
|||
// Returns true if there is at least one local or remote handler.
|
||||
operator bool() const;
|
||||
|
||||
void SetUsed() { used = true; }
|
||||
bool Used() { return used; }
|
||||
void SetUsed() { used = true; }
|
||||
bool Used() { return used; }
|
||||
|
||||
// Handlers marked as error handlers will not be called recursively to
|
||||
// avoid infinite loops if they trigger a similar error themselves.
|
||||
void SetErrorHandler() { error_handler = true; }
|
||||
bool ErrorHandler() { return error_handler; }
|
||||
|
||||
const char* Group() { return group; }
|
||||
void SetGroup(const char* arg_group)
|
||||
|
@ -57,6 +62,7 @@ private:
|
|||
FuncType* type;
|
||||
bool used; // this handler is indeed used somewhere
|
||||
bool enabled;
|
||||
bool error_handler; // this handler reports error messages.
|
||||
|
||||
declare(List, SourceID);
|
||||
typedef List(SourceID) receiver_list;
|
||||
|
@ -74,6 +80,9 @@ public:
|
|||
const EventHandlerPtr& operator=(const EventHandlerPtr& h)
|
||||
{ handler = h.handler; return *this; }
|
||||
|
||||
bool operator==(const EventHandlerPtr& h) const
|
||||
{ return handler == h.handler; }
|
||||
|
||||
EventHandler* Ptr() { return handler; }
|
||||
|
||||
operator bool() const { return handler && *handler; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue