kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add module reload instrumentation for TEST_FRAMEWORK

Browse Source 
This adds AMI events for module reloads when Asterisk is built with
TEST_FRAMEWORK enabled and corrects generation of the module load AMI
event.

(issue PQ-1126)
........

Merged revisions 371393 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 371394 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@371395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2012-08-16 22:44:17 +00:00
parent cf9265008d
commit 94bbcafcd2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/loader.c
View File

@@ -750,6 +750,8 @@ int ast_module_reload(const char *name)
} }
if (!info->reload) { /* cannot be reloaded */ if (!info->reload) { /* cannot be reloaded */
/* Nothing to reload, so reload is successful */
ast_test_suite_event_notify("MODULE_RELOAD", "Message: %s", cur->resource);
if (res < 1) /* store result if possible */ if (res < 1) /* store result if possible */
res = 1; /* 1 = no reload() method */ res = 1; /* 1 = no reload() method */
continue; continue;
@@ -757,7 +759,9 @@ int ast_module_reload(const char *name)
res = 2; res = 2;
ast_verb(3, "Reloading module '%s' (%s)\n", cur->resource, info->description); ast_verb(3, "Reloading module '%s' (%s)\n", cur->resource, info->description);
info->reload(); if (!info->reload()) {
ast_test_suite_event_notify("MODULE_RELOAD", "Message: %s", cur->resource);
}
} }
AST_LIST_UNLOCK(&module_list); AST_LIST_UNLOCK(&module_list);
@@ -910,7 +914,9 @@ int ast_load_resource(const char *resource_name)
int res; int res;
AST_LIST_LOCK(&module_list); AST_LIST_LOCK(&module_list);
res = load_resource(resource_name, 0, NULL, 0); res = load_resource(resource_name, 0, NULL, 0);
ast_test_suite_event_notify("MODULE_LOAD", "Message: %s", resource_name); if (!res) {
ast_test_suite_event_notify("MODULE_LOAD", "Message: %s", resource_name);
}
AST_LIST_UNLOCK(&module_list); AST_LIST_UNLOCK(&module_list);
return res; return res;