diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-12 20:03:58 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-12 20:03:58 +0000 |
| commit | bd1aa2615d49b8691b313653e594115403087c8e (patch) | |
| tree | 11e895a2000e3d155cbc0e3e15d8b7fbe35e28cf | |
| parent | ec2574aaf8f40b2e3f6b2d8e4caaf4511aa8b68a (diff) | |
Merged revisions 262800 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r262800 | pabelanger | 2010-05-12 15:59:16 -0400 (Wed, 12 May 2010) | 8 lines
Notify CLI when modules is loaded / unloaded
(closes issue #17308)
Reported by: pabelanger
Patches:
cli.modules.patch uploaded by pabelanger (license 224)
Tested by: pabelanger, russell
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@262803 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/cli.c | 3 | ||||
| -rw-r--r-- | main/loader.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/cli.c b/main/cli.c index c1b4a62f2..33cd3c682 100644 --- a/main/cli.c +++ b/main/cli.c @@ -163,6 +163,7 @@ static char *handle_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args * ast_cli(a->fd, "Unable to load module %s\n", a->argv[e->args]); return CLI_FAILURE; } + ast_cli(a->fd, "Loaded %s\n", a->argv[e->args]); return CLI_SUCCESS; } @@ -424,7 +425,9 @@ static char *handle_unload(struct ast_cli_entry *e, int cmd, struct ast_cli_args ast_cli(a->fd, "Unable to unload resource %s\n", a->argv[x]); return CLI_FAILURE; } + ast_cli(a->fd, "Unloaded %s\n", a->argv[x]); } + return CLI_SUCCESS; } diff --git a/main/loader.c b/main/loader.c index 0c8f306c1..dd4ea4d18 100644 --- a/main/loader.c +++ b/main/loader.c @@ -508,7 +508,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f if (!(mod = find_resource(resource_name, 0))) { AST_LIST_UNLOCK(&module_list); ast_log(LOG_WARNING, "Unload failed, '%s' could not be found\n", resource_name); - return 0; + return -1; } if (!(mod->flags.running || mod->flags.declined)) |