aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xasterisk.c6
-rwxr-xr-xlogger.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/asterisk.c b/asterisk.c
index 1a0a6dfe3..f74d0acb2 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -247,13 +247,15 @@ static void network_verboser(const char *s, int pos, int replace, int complete)
char *t = alloca(strlen(s) + 2);
if (t) {
sprintf(t, "\r%s", s);
- ast_network_puts(t);
+ if (complete)
+ ast_network_puts(t);
} else {
ast_log(LOG_ERROR, "Out of memory\n");
ast_network_puts(s);
}
} else {
- ast_network_puts(s);
+ if (complete)
+ ast_network_puts(s);
}
}
diff --git a/logger.c b/logger.c
index 0fd0b2f29..390496834 100755
--- a/logger.c
+++ b/logger.c
@@ -52,7 +52,7 @@ static char dateformat[256] = "%b %e %T"; /* Original Asterisk Format */
AST_MUTEX_DEFINE_STATIC(msglist_lock);
AST_MUTEX_DEFINE_STATIC(loglock);
static int pending_logger_reload = 0;
-static int global_logmask = 0;
+static int global_logmask = -1;
static struct msglist {
char *msg;