From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 28 May 2011 08:36:11 +0000 (+0200)
Subject: Make debug output easier to read.
X-Git-Tag: release_3_0_0_beta0~795
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba18f024b15e40420cde5006e7d3c7540b489983;p=thirdparty%2Ffreeradius-server.git

Make debug output easier to read.

Print group names, value of "foreach" variables, and change
punctuation to whitespace (which is easier to read)
---

diff --git a/src/main/log.c b/src/main/log.c
index 327a501af9c..4dc25d260c3 100644
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -295,7 +295,7 @@ void radlog_request(int lvl, int priority, REQUEST *request, const char *msg, ..
 	}
 	
 	if (request && request->module[0]) {
-		snprintf(buffer + len, sizeof(buffer) + len, "[%s] ", request->module);
+		snprintf(buffer + len, sizeof(buffer) + len, "%s : ", request->module);
 		len = strlen(buffer);
 	}
 	vsnprintf(buffer + len, sizeof(buffer) - len, msg, ap);
diff --git a/src/main/modcall.c b/src/main/modcall.c
index 1dd8b1a9ef6..01190ce7fcb 100644
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -342,10 +342,12 @@ static const char *group_name[] = {
 	"case",
 	"foreach",
 #endif
-	"policy"
+	"policy",
+	"reference",
+	"xlat"
 };
 
-static const char *modcall_spaces = "++++++++++++++++++++++++++++++++";
+static const char *modcall_spaces = "                              ";
 
 #define MODCALL_STACK_MAX (32)
 
@@ -465,6 +467,10 @@ int modcall(int component, modcallable *c, REQUEST *request)
 			int rcode;
 			modgroup *g = mod_callabletogroup(child);
 
+			RDEBUG2("%.*supdate %s {",
+				stack.pointer + 1, modcall_spaces,
+				child->name);
+
 			rcode = radius_update_attrlist(request, g->cs,
 						       g->vps, child->name);
 			if (rcode != RLM_MODULE_UPDATED) {
@@ -495,14 +501,25 @@ int modcall(int component, modcallable *c, REQUEST *request)
 			}
 
 			if (depth < 0) {
-				RDEBUG("ERROR: Foreach Nesting too deep!");
+				RDEBUG("ERROR: foreach Nesting too deep!");
 				myresult = RLM_MODULE_FAIL;
 				goto handle_result;
 			}
 
 			if (radius_get_vp(request, child->name, &vp)) {
-				RDEBUG2("Foreach %s", child->name);
+				RDEBUG2("%.*sforeach %s {",
+					stack.pointer + 1, modcall_spaces,
+					child->name);
 				while (vp) {
+#ifndef NDEBUG
+					if (fr_debug_flag >= 2) {
+						char buffer[1024];
+
+						vp_prints_value(buffer, sizeof(buffer), vp, 1);
+						RDEBUG2("%.*s #  Foreach-Variable-%d = %s", stack.pointer + 1, modcall_spaces, depth, buffer);
+					}
+#endif
+
 					request_data_add(request, radius_get_vp,
 							 depth, vp, NULL);
 
@@ -592,6 +609,11 @@ int modcall(int component, modcallable *c, REQUEST *request)
 
 			stack.priority[stack.pointer] = 0;
 			stack.result[stack.pointer] = default_component_results[component];
+
+			RDEBUG2("%.*s%s %s {",
+				stack.pointer + 1, modcall_spaces,
+				group_name[child->type], child->name);
+
 			switch (child->type) {
 #ifdef WITH_UNLANG
 				char buffer[1024];
@@ -692,7 +714,7 @@ int modcall(int component, modcallable *c, REQUEST *request)
 				/*
 				 *	Print message for NULL group
 				 */
-				RDEBUG2("%.*s- %s %s returns %s",
+				RDEBUG2("%.*s- %s %s = %s",
 				       stack.pointer + 1, modcall_spaces,
 				       group_name[child->type],
 				       child->name ? child->name : "",
@@ -717,12 +739,19 @@ int modcall(int component, modcallable *c, REQUEST *request)
 		sp = mod_callabletosingle(child);
 
 		myresult = call_modsingle(child->method, sp, request);
-	handle_result:
-		RDEBUG2("%.*s[%s] returns %s",
-		       stack.pointer + 1, modcall_spaces,
-		       child->name ? child->name : "",
-		       fr_int2str(rcode_table, myresult, "??"));
-
+		RDEBUG2("%.*s[%s] = %s",
+			stack.pointer + 1, modcall_spaces,
+			child->name ? child->name : "",
+			fr_int2str(rcode_table, myresult, "??"));
+		
+		if (0) {
+		handle_result:
+			RDEBUG2("%.*s} # %s %s = %s",
+				stack.pointer + 1, modcall_spaces,
+				group_name[child->type], child->name ? child->name : "",
+				fr_int2str(rcode_table, myresult, "??"));
+		}
+		
 		/*
 		 *	This is a bit of a hack...
 		 */