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

Add error events to input framework.

Browse source 
This change introduces error events for Table and Event readers. Users
can now specify an event that is called when an info, warning, or error
is emitted by their input reader. This can, e.g., be used to raise
notices in case errors occur when reading an important input stream.

Example:

event error_event(desc: Input::TableDescription, msg: string, level: Reporter::Level)
	{
	...
	}

event bro_init()
	{
	Input::add_table([$source="a", $error_ev=error_event, ...]);
	}

For the moment, this converts all errors in the Asciiformatter into
warnings (to show that they are non-fatal) - the Reader itself also has
to throw an Error to show that a fatal error occurred and processing
will be abort.

It might be nicer to change this and require readers to mark fatal
errors as such when throwing them.

Addresses BIT-1181
This commit is contained in:
Johanna Amann 2016-07-22 17:33:42 -07:00
parent 697b59cdc8
commit 6b9abe85a7
29 changed files with 458 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/threading/Formatter.h
View file

@ -23,7 +23,7 @@ public:
* internal formatting.
*
*/
Formatter(threading::MsgThread* t);
explicit Formatter(threading::MsgThread* t);
/**
* Destructor.

24
src/threading/MsgThread.h
View file

@ -64,7 +64,7 @@ public:
*
* @param msg The message. It will be prefixed with the thread's name.
*/
void Info(const char* msg);
virtual void Info(const char* msg);
/**
* Reports a warning from the child thread that may indicate a
@ -73,9 +73,14 @@ public:
*
* Only the child thread may call this method.
*
* Can be overriden in derived classed to hook into the error handling
* but must should generally also call the parent implementation. Note
* that this method is always called by the child thread and must not access
* data or datastructures of the main thread directly.
*
* @param msg The message. It will be prefixed with the thread's name.
*/
void Warning(const char* msg);
virtual void Warning(const char* msg);
/**
* Reports a non-fatal error from the child thread. The main thread
@ -84,9 +89,14 @@ public:
*
* Only the child thread may call this method.
*
* Can be overriden in derived classed to hook into the error handling
* but must should generally also call the parent implementation. Note
* that this method is always called by the child thread and must not access
* data or datastructures of the main thread directly.
*
* @param msg The message. It will be prefixed with the thread's name.
*/
void Error(const char* msg);
virtual void Error(const char* msg);
/**
* Reports a fatal error from the child thread. The main thread will
@ -223,10 +233,10 @@ protected:
* Overriden from BasicThread.
*
*/
virtual void Run();
virtual void OnWaitForStop();
virtual void OnSignalStop();
virtual void OnKill();
void Run() override;
void OnWaitForStop() override;
void OnSignalStop() override;
void OnKill() override;
private:
/**

22
src/threading/formatters/Ascii.cc
View file

@ -232,7 +232,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
val->val.int_val = 0;
else
{
GetThread()->Error(GetThread()->Fmt("Field: %s Invalid value for boolean: %s",
GetThread()->Warning(GetThread()->Fmt("Field: %s Invalid value for boolean: %s",
name.c_str(), start));
goto parse_error;
}
@ -273,7 +273,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
size_t pos = unescaped.find("/");
if ( pos == unescaped.npos )
{
GetThread()->Error(GetThread()->Fmt("Invalid value for subnet: %s", start));
GetThread()->Warning(GetThread()->Fmt("Invalid value for subnet: %s", start));
goto parse_error;
}
@ -348,7 +348,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
if ( pos >= length )
{
GetThread()->Error(GetThread()->Fmt("Internal error while parsing set. pos %d >= length %d."
GetThread()->Warning(GetThread()->Fmt("Internal error while parsing set. pos %d >= length %d."
" Element: %s", pos, length, element.c_str()));
error = true;
break;
@ -357,7 +357,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
threading::Value* newval = ParseValue(element, name, subtype);
if ( newval == 0 )
{
GetThread()->Error("Error while reading set or vector");
GetThread()->Warning("Error while reading set or vector");
error = true;
break;
}
@ -375,7 +375,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
lvals[pos] = ParseValue("", name, subtype);
if ( lvals[pos] == 0 )
{
GetThread()->Error("Error while trying to add empty set element");
GetThread()->Warning("Error while trying to add empty set element");
goto parse_error;
}
@ -394,7 +394,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
if ( pos != length )
{
GetThread()->Error(GetThread()->Fmt("Internal error while parsing set: did not find all elements: %s", start));
GetThread()->Warning(GetThread()->Fmt("Internal error while parsing set: did not find all elements: %s", start));
goto parse_error;
}
@ -402,7 +402,7 @@ threading::Value* Ascii::ParseValue(const string& s, const string& name, TypeTag
}
default:
GetThread()->Error(GetThread()->Fmt("unsupported field format %d for %s", type,
GetThread()->Warning(GetThread()->Fmt("unsupported field format %d for %s", type,
name.c_str()));
goto parse_error;
}
@ -419,13 +419,13 @@ bool Ascii::CheckNumberError(const char* start, const char* end) const
threading::MsgThread* thread = GetThread();
if ( end == start && *end != '\0' ) {
thread->Error(thread->Fmt("String '%s' contained no parseable number", start));
thread->Warning(thread->Fmt("String '%s' contained no parseable number", start));
return true;
}
if ( end - start == 0 && *end == '\0' )
{
thread->Error("Got empty string for number field");
thread->Warning("Got empty string for number field");
return true;
}
@ -434,13 +434,13 @@ bool Ascii::CheckNumberError(const char* start, const char* end) const
if ( errno == EINVAL )
{
thread->Error(thread->Fmt("String '%s' could not be converted to a number", start));
thread->Warning(thread->Fmt("String '%s' could not be converted to a number", start));
return true;
}
else if ( errno == ERANGE )
{
thread->Error(thread->Fmt("Number '%s' out of supported range.", start));
thread->Warning(thread->Fmt("Number '%s' out of supported range.", start));
return true;
}