Merge remote-tracking branch 'origin/master' into topic/bernhard/localnet

This commit is contained in:
Bernhard Amann 2011-12-03 20:15:05 -08:00
commit 949ec6897a
40 changed files with 448 additions and 240 deletions

View file

@ -130,6 +130,13 @@ event remote_log(level: count, src: count, msg: string)
do_script_log_common(level, src, msg);
}
# This is a core generated event.
event remote_log_peer(p: event_peer, level: count, src: count, msg: string)
{
local rmsg = fmt("[#%d/%s:%d] %s", p$id, p$host, p$p, msg);
do_script_log_common(level, src, rmsg);
}
function do_script_log(p: event_peer, msg: string)
{
do_script_log_common(REMOTE_LOG_INFO, REMOTE_SRC_SCRIPT, msg);