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

Always emit scripting errors to stderr during zeek_init

Browse source 
Otherwise, setting Reporter::errors_to_stderr=F causes important
error messages to be lost (and this setting is the default for
ZeekCtl).  E.g. now that we terminate if there's errors during
zeek_init, GH-369 shows that the only error message given was
"fatal error: errors occurred while initializing", which is not
helpful in determining the actual issue.
This commit is contained in:
Jon Siwek 2019-05-17 14:13:46 -07:00
parent 9d07e4f0b8
commit dd173f4961
6 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Reporter.cc
View file

@ -31,12 +31,14 @@ Reporter::Reporter()
via_events = false;
in_error_handler = 0;
// Always use stderr at startup/init before scripts have been fully parsed.
// Always use stderr at startup/init before scripts have been fully parsed
// and zeek_init() processed.
// Messages may otherwise be missed if an error occurs that prevents events
// from ever being dispatched.
info_to_stderr = true;
warnings_to_stderr = true;
errors_to_stderr = true;
after_zeek_init = false;
weird_count = 0;
weird_sampling_rate = 0;
@ -80,7 +82,7 @@ void Reporter::Info(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
FILE* out = info_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(info_to_stderr) ? stderr : 0;
DoLog("", reporter_info, out, 0, 0, true, true, 0, fmt, ap);
va_end(ap);
}
@ -89,7 +91,7 @@ void Reporter::Warning(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
FILE* out = warnings_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(warnings_to_stderr) ? stderr : 0;
DoLog("warning", reporter_warning, out, 0, 0, true, true, 0, fmt, ap);
va_end(ap);
}
@ -99,7 +101,7 @@ void Reporter::Error(const char* fmt, ...)
++errors;
va_list ap;
va_start(ap, fmt);
FILE* out = errors_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(errors_to_stderr) ? stderr : 0;
DoLog("error", reporter_error, out, 0, 0, true, true, 0, fmt, ap);
va_end(ap);
}
@ -142,7 +144,7 @@ void Reporter::ExprRuntimeError(const Expr* expr, const char* fmt, ...)
PushLocation(expr->GetLocationInfo());
va_list ap;
va_start(ap, fmt);
FILE* out = errors_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(errors_to_stderr) ? stderr : 0;
DoLog("expression error", reporter_error, out, 0, 0, true, true,
d.Description(), fmt, ap);
va_end(ap);
@ -156,7 +158,7 @@ void Reporter::RuntimeError(const Location* location, const char* fmt, ...)
PushLocation(location);
va_list ap;
va_start(ap, fmt);
FILE* out = errors_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(errors_to_stderr) ? stderr : 0;
DoLog("runtime error", reporter_error, out, 0, 0, true, true, "", fmt, ap);
va_end(ap);
PopLocation();
@ -196,7 +198,7 @@ void Reporter::InternalWarning(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
FILE* out = warnings_to_stderr ? stderr : 0;
FILE* out = EmitToStderr(warnings_to_stderr) ? stderr : 0;
// TODO: would be nice to also log a call stack.
DoLog("internal warning", reporter_warning, out, 0, 0, true, true, 0, fmt,
ap);