Revert several changes from revision 102525, as the changes were not
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 12 Mar 2008 05:46:39 +0000 (05:46 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 12 Mar 2008 05:46:39 +0000 (05:46 +0000)
compatible, and, in fact, introduced regressions.
(Closes issue #12190)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107960 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dumpchan.c
apps/app_zapras.c
main/loader.c

index 17948af..37e040e 100644 (file)
@@ -141,8 +141,8 @@ static int dumpchan_exec(struct ast_channel *chan, void *data)
 
        pbx_builtin_serialize_variables(chan, &vars);
        serialize_showchan(chan, info, sizeof(info));
-       if (level > 0)
-               ast_verb(level, "\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line);
+       if (option_verbose >= level)
+               ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line);
 
        return 0;
 }
index 31f208d..231a9f2 100644 (file)
@@ -165,13 +165,14 @@ static void run_ras(struct ast_channel *chan, char *args)
                        if (res < 0) {
                                ast_log(LOG_WARNING, "wait4 returned %d: %s\n", res, strerror(errno));
                        }
-                       if (WIFEXITED(status))
+                       if (WIFEXITED(status)) {
                                ast_verb(3, "RAS on %s terminated with status %d\n", chan->name, WEXITSTATUS(status));
-                       else if (WIFSIGNALED(status))
-                               ast_verb(3, "RAS on %s terminated with signal %d\n", chan->name, WTERMSIG(status));
-                       else
-                               ast_verbose(VERBOSE_PREFIX_3 "RAS on %s terminated weirdly.\n", chan->name);
-
+                       } else if (WIFSIGNALED(status)) {
+                               ast_verb(3, "RAS on %s terminated with signal %d\n", 
+                                        chan->name, WTERMSIG(status));
+                       } else {
+                               ast_verb(3, "RAS on %s terminated weirdly.\n", chan->name);
+                       }
                        /* Throw back into audio mode */
                        x = 1;
                        ioctl(chan->fds[0], ZT_AUDIOMODE, &x);
index d34da9f..e05bac4 100644 (file)
@@ -699,8 +699,8 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
        case AST_MODULE_LOAD_SUCCESS:
                if (!ast_fully_booted) {
                        ast_verb(1, "%s => (%s)\n", resource_name, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp)));
-                       if (ast_opt_console)
-                               ast_verb(0, ".");
+                       if (ast_opt_console && !option_verbose)
+                               ast_verbose( ".");
                } else {
                        ast_verb(1, "Loaded %s => (%s)\n", resource_name, mod->info->description);
                }