From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 4 Aug 2010 08:13:10 +0000 (+0200)
Subject: Set "component" and "module" to more descriptive values
X-Git-Tag: release_3_0_0_beta0~1319
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=3e9a863aa7475261ad908b29899c8ad0c9351cd0

Set "component" and "module" to more descriptive values

So that when something goes wrong, we know where / why
---

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 02ce2ab..3196175 100644
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -297,7 +297,7 @@ static int call_modsingle(int component, modsingle *sp, REQUEST *request)
 	myresult = sp->modinst->entry->module->methods[component](
 			sp->modinst->insthandle, request);
 
-	request->module = "";
+	request->module = "<processing>";
 	safe_unlock(sp->modinst);
 
  fail:
diff --git a/src/main/modules.c b/src/main/modules.c
index 97a927d..ad49fe0 100644
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -599,7 +599,8 @@ module_instance_t *find_module_instance(CONF_SECTION *modules,
 	} else {
 	print_inst:
 		check_config_safe = TRUE;
-		cf_log_module(cs, "Instantiating %s", instname);
+		cf_log_module(cs, "Instantiating module \"%s\" from file %s",
+			      instname, cf_section_filename(cs));
 	}
 
 	/*
@@ -733,13 +734,23 @@ int indexed_modcall(int comp, int idx, REQUEST *request)
 				section_type_value[comp].typename);
 		}
 	}
-
+	
+	if (server->subcs[comp]) {
+		if (idx == 0) {
+			RDEBUG("# Executing section %s from file %s",
+			       section_type_value[comp].section,
+			       cf_section_filename(server->subcs[comp]));
+		} else {
+			RDEBUG("# Executing group from file %s",
+			       cf_section_filename(server->subcs[comp]));
+		}
+	}
 	request->component = section_type_value[comp].section;
 
 	rcode = modcall(comp, list, request);
 
-	request->module = "";
-	request->component = "";
+	request->module = "<processing>";
+	request->component = "<core>";
 	return rcode;
 }
 
@@ -971,9 +982,11 @@ static int load_byserver(CONF_SECTION *cs)
 	indexed_modcallable *c;
 
 	if (name) {
-		cf_log_info(cs, "server %s {", name);
+		cf_log_info(cs, "server %s { # from file %s",
+			    name, cf_section_filename(cs));
 	} else {
-		cf_log_info(cs, "server {");
+		cf_log_info(cs, "server { # from file %s",
+			    cf_section_filename(cs));
 	}
 
 	cf_log_info(cs, " modules {");
diff --git a/src/main/threads.c b/src/main/threads.c
index 1b98e4e..2ce7939 100644
--- a/src/main/threads.c
+++ b/src/main/threads.c
@@ -307,7 +307,8 @@ static int request_enqueue(REQUEST *request, RAD_REQUEST_FUNP fun)
 		return 0;
 	}
 	request->child_state = REQUEST_QUEUED;
-	request->component = "<queue>";
+	request->component = "<core>";
+	request->module = "<queue>";
 
 	entry = rad_malloc(sizeof(*entry));
 	entry->request = request;
@@ -411,7 +412,8 @@ static int request_dequeue(REQUEST **request, RAD_REQUEST_FUNP *fun)
 	rad_assert((*request)->magic == REQUEST_MAGIC);
 	rad_assert(*fun != NULL);
 
-	(*request)->component = "";
+	(*request)->component = "<core>";
+	(*request)->module = "<thread>";
 
 	/*
 	 *	If the request has sat in the queue for too long,
@@ -422,6 +424,7 @@ static int request_dequeue(REQUEST **request, RAD_REQUEST_FUNP *fun)
 	 *	have acknowledged it as "done".
 	 */
 	if ((*request)->master_state == REQUEST_STOP_PROCESSING) {
+		(*request)->module = "<done>";
 		(*request)->child_state = REQUEST_DONE;
 		goto retry;
 	}
diff --git a/src/main/util.c b/src/main/util.c
index c141274..e29fff8 100644
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -391,8 +391,8 @@ REQUEST *request_alloc(void)
 	request->timestamp = time(NULL);
 	request->options = RAD_REQUEST_OPTION_NONE;
 
-	request->module = "";
-	request->component = "";
+	request->module = "<receive>";
+	request->component = "<core>";
 	if (debug_flag) request->radlog = radlog_request;
 
 	return request;