From 36dbaa5b925a09c425aee5fd13c974e93decebbd Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@icir.org>
Date: Thu, 29 Sep 2011 15:53:54 -0400
Subject: [PATCH] Loaded scripts is indented with spaces now and makes more
 sense to look at.

- Updated a test to make it pass again.
---
 scripts/policy/misc/loaded-scripts.bro        | 19 +++++++++--
 .../canonified_loaded_scripts.log             | 32 +++++++++----------
 .../btest/coverage/bare-load-baseline.test    |  2 +-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/scripts/policy/misc/loaded-scripts.bro b/scripts/policy/misc/loaded-scripts.bro
index 77aea3dc4f..7dd7025689 100644
--- a/scripts/policy/misc/loaded-scripts.bro
+++ b/scripts/policy/misc/loaded-scripts.bro
@@ -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)]);
 	}
\ No newline at end of file
diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
index cc2b04a868..6819dc0813 100644
--- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
@@ -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
diff --git a/testing/btest/coverage/bare-load-baseline.test b/testing/btest/coverage/bare-load-baseline.test
index 0e532901c8..52393afb7c 100644
--- a/testing/btest/coverage/bare-load-baseline.test
+++ b/testing/btest/coverage/bare-load-baseline.test
@@ -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