Loaded scripts is indented with spaces now and makes more sense to look at.

- Updated a test to make it pass again.
This commit is contained in:
Seth Hall 2011-09-29 15:53:54 -04:00
parent 7ae4a37279
commit 36dbaa5b92
3 changed files with 33 additions and 20 deletions

View file

@ -4,17 +4,30 @@ export {
redef enum Log::ID += { LOG };
type Info: record {
depth: count &log;
name: string &log;
};
}
event bro_init()
const depth: table[count] of string = {
[0] = "",
[1] = " ",
[2] = " ",
[3] = " ",
[4] = " ",
[5] = " ",
[6] = " ",
[7] = " ",
[8] = " ",
[9] = " ",
[10] = " ",
};
event bro_init() &priority=5
{
Log::create_stream(LoadedScripts::LOG, [$columns=Info]);
}
event bro_script_loaded(path: string, level: count)
{
Log::write(LoadedScripts::LOG, [$depth=level, $name=path]);
Log::write(LoadedScripts::LOG, [$name=cat(depth[level], path)]);
}

View file

@ -1,18 +1,18 @@
#separator \x09
#path loaded_scripts
#fields depth name
#types count string
0 scripts/base/init-bare.bro
1 build/src/base/const.bif.bro
1 build/src/base/types.bif.bro
1 build/src/base/strings.bif.bro
1 build/src/base/bro.bif.bro
1 build/src/base/reporter.bif.bro
1 build/src/base/event.bif.bro
1 scripts/base/frameworks/logging/__load__.bro
2 scripts/base/frameworks/logging/./main.bro
3 build/src/base/logging.bif.bro
2 scripts/base/frameworks/logging/./postprocessors/__load__.bro
3 scripts/base/frameworks/logging/./postprocessors/./scp.bro
2 scripts/base/frameworks/logging/./writers/ascii.bro
0 scripts/policy/misc/loaded-scripts.bro
#fields name
#types string
scripts/base/init-bare.bro
build/src/base/const.bif.bro
build/src/base/types.bif.bro
build/src/base/strings.bif.bro
build/src/base/bro.bif.bro
build/src/base/reporter.bif.bro
build/src/base/event.bif.bro
scripts/base/frameworks/logging/__load__.bro
scripts/base/frameworks/logging/./main.bro
build/src/base/logging.bif.bro
scripts/base/frameworks/logging/./postprocessors/__load__.bro
scripts/base/frameworks/logging/./postprocessors/./scp.bro
scripts/base/frameworks/logging/./writers/ascii.bro
scripts/policy/misc/loaded-scripts.bro

View file

@ -9,6 +9,6 @@
# @TEST-EXEC: bro -b misc/loaded-scripts
# @TEST-EXEC: test -e loaded_scripts.log
# @TEST-EXEC: cat loaded_scripts.log | egrep -v '#' | awk 'NR>0{print $2}' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix
# @TEST-EXEC: cat loaded_scripts.log | egrep -v '#' | awk 'NR>0{print $1}' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix
# @TEST-EXEC: cat loaded_scripts.log | sed "s#`cat prefix`##g" >canonified_loaded_scripts.log
# @TEST-EXEC: btest-diff canonified_loaded_scripts.log