diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 19:50:47 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 19:50:47 +0000 |
| commit | 37300432aec9db3d1ccc79d501462965374d76fb (patch) | |
| tree | 9f978ba5cf4a74e28deffb013093336a2cffaa3e /main/loader.c | |
| parent | 22c23f6d6f846ce08d3b90f24e6980f7fd35209e (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@103729 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c index 08139af60..370e41fa4 100644 --- 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 */ |