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

Overhauling the internal reporting of messages to the user.

Browse source 
The Logger class is now in charge of reporting all errors, warnings,
informational messages, weirds, and syslogs. All other components
route their messages through the global bro_logger singleton.

The Logger class comes with these reporting methods:

    void Message(const char* fmt, ...);
    void Warning(const char* fmt, ...);
    void Error(const char* fmt, ...);
    void FatalError(const char* fmt, ...); // Terminate Bro.
    void Weird(const char* name);
    [ .. some more Weird() variants ... ]
    void Syslog(const char* fmt, ...);
    void InternalWarning(const char* fmt, ...);
    void InternalError(const char* fmt, ...); // Terminates Bro.

See Logger.h for more information on these.

Generally, the reporting now works as follows:

    - All non-fatal message are reported in one of two ways:

        (1) At startup (i.e., before we start processing packets),
            they are logged to stderr.

        (2) During processing, they turn into events:

            event log_message%(msg: string, location: string%);
            event log_warning%(msg: string, location: string%);
            event log_error%(msg: string, location: string%);

            The script level can then handle them as desired.

            If we don't have an event handler, we fall back to
            reporting on stderr.

    - All fatal errors are logged to stderr and Bro terminates
      immediately.

    - Syslog(msg) directly syslogs, but doesn't do anything else.

The three main types of messages can also be generated on the
scripting layer via new Log::* bifs:

    Log::error(msg: string);
    Log::warning(msg: string);
    Log::message(msg: string);

These pass through the bro_logger as well and thus are handled in the
same way. Their output includes location information.

More changes:

    - Removed the alarm statement and the alarm_hook event.

    - Adapted lots of locations to use the bro_logger, including some
      of the messages that were previously either just written to
      stdout, or even funneled through the alarm mechanism.

    - No distinction anymore between Error() and RunTime(). There's
      now only one class of errors; the line was quite blurred already
      anyway.

    - util.h: all the error()/warn()/message()/run_time()/pinpoint()
      functions are gone. Use the bro_logger instead now.

    - Script errors are formatted a bit differently due to the
      changes. What I've seen so far looks ok to me, but let me know
      if there's something odd.

Notes:

    - The default handlers for the new log_* events are just dummy
      implementations for now since we need to integrate all this into
      the new scripts anyway.

    - I'm not too happy with the names of the Logger class and its
      instance bro_logger. We now have a LogMgr as well, which makes
      this all a bit confusing. But I didn't have a good idea for
      better names so I stuck with them for now.

      Perhaps we should merge Logger and LogMgr?
This commit is contained in:
Robin Sommer 2011-06-24 21:33:05 -07:00
parent ff7b92ffc8
commit 93894eed9b
140 changed files with 2453 additions and 1054 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Type.cc
View file

@ -9,6 +9,7 @@
#include "Expr.h"
#include "Scope.h"
#include "Serializer.h"
#include "Logger.h"
#include <string>
#include <list>
@ -315,7 +316,7 @@ int TypeList::AllMatch(const BroType* t, int is_init) const
void TypeList::Append(BroType* t)
{
if ( pure_type && ! same_type(t, pure_type) )
internal_error("pure type-list violation");
bro_logger->InternalError("pure type-list violation");
types.append(t);
}
@ -932,7 +933,7 @@ void RecordType::Init(TypeList* arg_base)
if ( fields->Lookup(tdij->id) )
{
error("duplicate field", tdij->id);
bro_logger->Error("duplicate field", tdij->id);
continue;
}
@ -1023,7 +1024,7 @@ const TypeDecl* RecordType::FieldDecl(int field) const
{
RecordField* rf = fields->NthEntry(field);
if ( ! rf )
internal_error("missing field in RecordType::FieldDecl");
bro_logger->InternalError("missing field in RecordType::FieldDecl");
BroType* bt = (*base->Types())[rf->base];
RecordType* rbt = bt->AsRecordType();
@ -1340,7 +1341,7 @@ CommentedEnumType::~CommentedEnumType()
}
}
// Note, we use error() here (not Error()) to include the current script
// Note, we use bro_logger->Error() here (not Error()) to include the current script
// location in the error message, rather than the one where the type was
// originally defined.
void EnumType::AddName(const string& module_name, const char* name, bool is_export)
@ -1348,7 +1349,7 @@ void EnumType::AddName(const string& module_name, const char* name, bool is_expo
/* implicit, auto-increment */
if ( counter < 0)
{
error("cannot mix explicit enumerator assignment and implicit auto-increment");
bro_logger->Error("cannot mix explicit enumerator assignment and implicit auto-increment");
SetError();
return;
}
@ -1361,7 +1362,7 @@ void EnumType::AddName(const string& module_name, const char* name, bro_int_t va
/* explicit value specified */
if ( counter > 0 )
{
error("cannot mix explicit enumerator assignment and implicit auto-increment");
bro_logger->Error("cannot mix explicit enumerator assignment and implicit auto-increment");
SetError();
return;
}
@ -1394,7 +1395,7 @@ void EnumType::AddNameInternal(const string& module_name, const char* name, bro_
ID *id;
if ( Lookup(val) )
{
error("enumerator value in enumerated type definition already exists");
bro_logger->Error("enumerator value in enumerated type definition already exists");
SetError();
return;
}
@ -1408,7 +1409,7 @@ void EnumType::AddNameInternal(const string& module_name, const char* name, bro_
}
else
{
error("identifier or enumerator value in enumerated type definition already exists");
bro_logger->Error("identifier or enumerator value in enumerated type definition already exists");
SetError();
return;
}
@ -1775,7 +1776,7 @@ int same_type(const BroType* t1, const BroType* t2, int is_init)
return same_type(t1, t2, is_init);
case TYPE_UNION:
error("union type in same_type()");
bro_logger->Error("union type in same_type()");
}
return 0;
}
@ -1820,7 +1821,7 @@ const BroType* flatten_type(const BroType* t)
const type_list* types = tl->Types();
if ( types->length() == 0 )
internal_error("empty type list in flatten_type");
bro_logger->InternalError("empty type list in flatten_type");
const BroType* ft = (*types)[0];
if ( types->length() == 1 || tl->AllMatch(ft, 0) )
@ -1869,7 +1870,7 @@ int is_assignable(BroType* t)
return 0;
case TYPE_UNION:
error("union type in is_assignable()");
bro_logger->Error("union type in is_assignable()");
}
return 0;
@ -1898,7 +1899,7 @@ TypeTag max_type(TypeTag t1, TypeTag t2)
}
else
{
internal_error("non-arithmetic tags in max_type()");
bro_logger->InternalError("non-arithmetic tags in max_type()");
return TYPE_ERROR;
}
}
@ -1993,7 +1994,7 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
return new TableType(tl3, y3);
else
{
internal_error("bad tag in merge_types");
bro_logger->InternalError("bad tag in merge_types");
return 0;
}
}
@ -2111,11 +2112,11 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
return new FileType(merge_types(t1->YieldType(), t2->YieldType()));
case TYPE_UNION:
internal_error("union type in merge_types()");
bro_logger->InternalError("union type in merge_types()");
return 0;
default:
internal_error("bad type in merge_types()");
bro_logger->InternalError("bad type in merge_types()");
return 0;
}
}
@ -2127,7 +2128,7 @@ BroType* merge_type_list(ListExpr* elements)
if ( tl->length() < 1 )
{
error("no type can be inferred for empty list");
bro_logger->Error("no type can be inferred for empty list");
return 0;
}
@ -2144,7 +2145,7 @@ BroType* merge_type_list(ListExpr* elements)
}
if ( ! t )
error("inconsistent types in list");
bro_logger->Error("inconsistent types in list");
return t;
}