diff options
| author | Matthew Jordan <mjordan@digium.com> | 2011-12-12 19:35:08 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2011-12-12 19:35:08 +0000 |
| commit | 9057aa20b6b822d3c14c241bea9709e6b61d7dbe (patch) | |
| tree | 6445c15c9eff3077dbd60ae7414b3583b1275acb /main/loader.c | |
| parent | e2597678b1bf10bb2ea2fac9cd6c3bd6e53e5b46 (diff) | |
Backed out core changes from r346391
During testing, it was discovered that there were a number of side effects
introduced by r346391 and subsequent check-ins related to it (r346429,
r346617, and r346655). This included the /main/stdtime/ test 'hanging',
as well as the remote console option failing to receive the appropriate output
after a period of time.
I only backed out the changes to main/ and utils/, as this was adequate
to reverse the behavior experienced.
(issue ASTERISK-18974)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/main/loader.c b/main/loader.c index f9b2de943..6cd5ffbdb 100644 --- a/main/loader.c +++ b/main/loader.c @@ -797,11 +797,8 @@ static enum ast_module_load_result start_resource(struct ast_module *mod) case AST_MODULE_LOAD_SUCCESS: if (!ast_fully_booted) { ast_verb(1, "%s => (%s)\n", mod->resource, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp))); - if (ast_opt_console && !option_verbose) { - /* This never looks good on anything but the root console, so - * it's best not to try to funnel it through the logger. */ - fprintf(stdout, "."); - } + if (ast_opt_console && !option_verbose) + ast_verbose( "."); } else { ast_verb(1, "Loaded %s => (%s)\n", mod->resource, mod->info->description); } |