From: Mark Spencer Date: Fri, 3 Sep 2004 14:02:12 +0000 (+0000) Subject: reload documentation, don't display res in app_test... X-Git-Tag: 1.0.0~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb57ea95d6d54e6dc16210effc42a778f9d7f98b;p=thirdparty%2Fasterisk.git reload documentation, don't display res in app_test... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3718 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_test.c b/apps/app_test.c index dab771945d..98f9373e15 100755 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -215,7 +215,7 @@ static int testclient_exec(struct ast_channel *chan, void *data) /* Step 6: Transmit tone noise */ ast_log(LOG_DEBUG, "TestClient: 6. Transmit tone\n"); res = sendnoise(chan, 6000); - fprintf(f, "SENDTONE: %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res); + fprintf(f, "SENDTONE: %s\n", (res < 0) ? "FAIL" : "PASS"); } if (!res || (res == '5')) { /* Step 7: Wait for "5" */ diff --git a/cli.c b/cli.c index 75aa35b070..9a2de9e6e5 100755 --- a/cli.c +++ b/cli.c @@ -82,9 +82,9 @@ static char chanlist_help[] = " a more easily machine parsable format\n"; static char reload_help[] = -"Usage: reload\n" -" Reloads configuration files for all modules which support\n" -" reloading.\n"; +"Usage: reload [module ...]\n" +" Reloads configuration files for all listed modules which support\n" +" reloading, or for all supported modules if none are listed.\n"; static char set_verbose_help[] = "Usage: set verbose \n" diff --git a/loader.c b/loader.c index d09514c813..2a539f30c5 100755 --- a/loader.c +++ b/loader.c @@ -157,10 +157,14 @@ void ast_module_reload(const char *name) ast_verbose("The previous reload command didn't finish yet\n"); return; } - read_ast_cust_config(); - reload_manager(); - ast_enum_reload(); - ast_rtp_reload(); + if (!name || !strcasecmp(name, "astconfig")) + read_ast_cust_config(); + if (!name || !strcasecmp(name, "manager")) + reload_manager(); + if (!name || !strcasecmp(name, "enum")) + ast_enum_reload(); + if (!name || !strcasecmp(name, "rtp")) + ast_rtp_reload(); time(&ast_lastreloadtime); ast_mutex_lock(&modlock);