mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
Console fix (bug #2764) and logger fix...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -247,13 +247,15 @@ static void network_verboser(const char *s, int pos, int replace, int complete)
|
|||||||
char *t = alloca(strlen(s) + 2);
|
char *t = alloca(strlen(s) + 2);
|
||||||
if (t) {
|
if (t) {
|
||||||
sprintf(t, "\r%s", s);
|
sprintf(t, "\r%s", s);
|
||||||
ast_network_puts(t);
|
if (complete)
|
||||||
|
ast_network_puts(t);
|
||||||
} else {
|
} else {
|
||||||
ast_log(LOG_ERROR, "Out of memory\n");
|
ast_log(LOG_ERROR, "Out of memory\n");
|
||||||
ast_network_puts(s);
|
ast_network_puts(s);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ast_network_puts(s);
|
if (complete)
|
||||||
|
ast_network_puts(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
logger.c
2
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(msglist_lock);
|
||||||
AST_MUTEX_DEFINE_STATIC(loglock);
|
AST_MUTEX_DEFINE_STATIC(loglock);
|
||||||
static int pending_logger_reload = 0;
|
static int pending_logger_reload = 0;
|
||||||
static int global_logmask = 0;
|
static int global_logmask = -1;
|
||||||
|
|
||||||
static struct msglist {
|
static struct msglist {
|
||||||
char *msg;
|
char *msg;
|
||||||
|
Reference in New Issue
Block a user