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: https://origsvn.digium.com/svn/asterisk/trunk@262800 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/cli.c b/main/cli.c
index 99dc1b5..acb1f6b 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -263,6 +263,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;
 }
 
@@ -586,7 +587,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 d8a9d64..3c27357 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -490,7 +490,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))