kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 22:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 262800 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@262802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-05-12 20:02:58 +00:00
parent 3bed330b49
commit 5b208feb2d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/cli.c
View File

@@ -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]); ast_cli(a->fd, "Unable to load module %s\n", a->argv[e->args]);
return CLI_FAILURE; return CLI_FAILURE;
} }
ast_cli(a->fd, "Loaded %s\n", a->argv[e->args]);
return CLI_SUCCESS; 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]); ast_cli(a->fd, "Unable to unload resource %s\n", a->argv[x]);
return CLI_FAILURE; return CLI_FAILURE;
} }
ast_cli(a->fd, "Unloaded %s\n", a->argv[x]);
} }
return CLI_SUCCESS; return CLI_SUCCESS;
} }

2
main/loader.c
View File

@@ -489,7 +489,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
if (!(mod = find_resource(resource_name, 0))) { if (!(mod = find_resource(resource_name, 0))) {
AST_LIST_UNLOCK(&module_list); AST_LIST_UNLOCK(&module_list);
ast_log(LOG_WARNING, "Unload failed, '%s' could not be found\n", resource_name); 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)) if (!(mod->flags.running || mod->flags.declined))