From: Automerge script <automerge@asterisk.org>
Date: Fri, 17 Aug 2012 16:25:18 +0000 (+0000)
Subject: Merged revisions 371437 via svnmerge from
X-Git-Tag: 10.9.0-digiumphones-rc1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae78f5d70b343aa8afa55607ddc847f1f1358527;p=thirdparty%2Fasterisk.git

Merged revisions 371437 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r371437 | kmoore | 2012-08-17 10:51:06 -0500 (Fri, 17 Aug 2012) | 11 lines

  Add instrumentation to subsystem reloads

  When Asterisk is built with TEST_FRAMEWORK defined, Asterisk will now
  generate TestEvent AMI events on subsystem reloads such as cdr, dnsmgr,
  extconfig, etc.

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/loader.c b/main/loader.c
index e69a82cfc2..d0dd8e145d 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -713,7 +713,9 @@ int ast_module_reload(const char *name)
 	/* Call "predefined" reload here first */
 	for (i = 0; reload_classes[i].name; i++) {
 		if (!name || !strcasecmp(name, reload_classes[i].name)) {
-			reload_classes[i].reload_fn();	/* XXX should check error ? */
+			if (!reload_classes[i].reload_fn()) {
+				ast_test_suite_event_notify("MODULE_RELOAD", "Message: %s", name);
+			}
 			res = 2;	/* found and reloaded */
 		}
 	}