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".

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103729 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/loader.c b/main/loader.c
index 08139af..370e41f 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -589,8 +589,16 @@ int ast_module_reload(const char *name)
                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 */