aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 18:24:03 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 18:24:03 +0000
commit14c37061ed893f00cecce8c19812b7e799ad2450 (patch)
tree33d99016a28497f5c2a3007edce2feea20b8981d /main
parent801b8efe65cbe386ba02ae0890a4803927f5c093 (diff)
Merged revisions 275182 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r275182 | mnicholson | 2010-07-09 13:23:23 -0500 (Fri, 09 Jul 2010) | 2 lines give a better error message when attempting to unload a module that is not loaded ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275186 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/loader.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c
index 69a5a8cd0..8a3d18bdb 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -494,8 +494,10 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
return -1;
}
- if (!mod->flags.running || mod->flags.declined)
+ if (!mod->flags.running || mod->flags.declined) {
+ ast_log(LOG_WARNING, "Unload failed, '%s' is not loaded.\n", resource_name);
error = 1;
+ }
if (!error && (mod->usecount > 0)) {
if (force)