[svn-commits] russell: trunk r103729 - in /trunk: ./ main/loader.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Feb 15 13:50:47 2008
New Revision: 103729

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103729
Log:
Merged revisions 103728 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103728 | russell | 2008-02-15 13:50:11 -0600 (Fri, 15 Feb 2008) | 4 lines

In the case that you try to directly reload a module has returned 
AST_MODULE_LOAD_DECLINE, log a message indicating that the module is not fully
initialized and must be initialized using "module load".

........

Modified:
    trunk/   (props changed)
    trunk/main/loader.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=103729&r1=103728&r2=103729
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Fri Feb 15 13:50:47 2008
@@ -589,8 +589,16 @@
 		if (name && resource_name_match(name, cur->resource))
 			continue;
 
-		if (!cur->flags.running || cur->flags.declined)
-			continue;
+		if (!cur->flags.running || cur->flags.declined) {
+			if (!name)
+				continue;
+			ast_log(LOG_NOTICE, "The module '%s' was not properly initialized.  "
+				"Before reloading the module, you must run \"module load %s\" "
+				"and fix whatever is preventing the module from being initialized.\n",
+				name, name);
+			res = 2; /* Don't report that the module was not found */
+			break;
+		}
 
 		if (!info->reload) {	/* cannot be reloaded */
 			if (res < 1)	/* store result if possible */