* \author Mark Spencer <markster@digium.com>
*/
-#include "asterisk.h"
+/*! \li \ref logger.c uses the configuration file \ref logger.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*!
+ * \page logger.conf logger.conf
+ * \verbinclude logger.conf.sample
+ */
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
/* When we include logger.h again it will trample on some stuff in syslog.h, but
* nothing we care about in here. */
#include <syslog.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include "asterisk/_private.h"
#include "asterisk/paths.h" /* use ast_config_AST_LOG_DIR */
#include "asterisk/cli.h"
#include "asterisk/utils.h"
#include "asterisk/manager.h"
+#include "asterisk/astobj2.h"
#include "asterisk/threadstorage.h"
#include "asterisk/strings.h"
#include "asterisk/pbx.h"
#include "asterisk/app.h"
#include "asterisk/syslog.h"
+#include "asterisk/buildinfo.h"
+#include "asterisk/ast_version.h"
+#include "asterisk/backtrace.h"
+#include "asterisk/json.h"
-#include <signal.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef HAVE_BKTR
-#include <execinfo.h>
-#define MAX_BACKTRACE_FRAMES 20
-#endif
-
-#if defined(__linux__) && !defined(__NR_gettid)
-#include <asm/unistd.h>
-#endif
+/*** DOCUMENTATION
+ ***/
-#if defined(__linux__) && defined(__NR_gettid)
-#define GETTID() syscall(__NR_gettid)
-#else
-#define GETTID() getpid()
-#endif
static char dateformat[256] = "%b %e %T"; /* Original Asterisk Format */
static char queue_log_name[256] = QUEUELOG;
static int filesize_reload_needed;
static unsigned int global_logmask = 0xFFFF;
+static int queuelog_init;
+static int logger_initialized;
+static volatile int next_unique_callid = 1; /* Used to assign unique call_ids to calls */
+static int display_callids;
+
+AST_THREADSTORAGE(unique_callid);
+
+static int logger_queue_size;
+static int logger_queue_limit = 1000;
+static int logger_messages_discarded;
+static unsigned int high_water_alert;
static enum rotatestrategy {
+ NONE = 0, /* Do not rotate log files at all, instead rely on external mechanisms */
SEQUENTIAL = 1 << 0, /* Original method - create a new file, in order */
ROTATE = 1 << 1, /* Rotate all files, such that the oldest file has the highest suffix */
TIMESTAMP = 1 << 2, /* Append the epoch timestamp onto the end of the archived file */
static struct {
unsigned int queue_log:1;
+ unsigned int queue_log_to_file:1;
+ unsigned int queue_adaptive_realtime:1;
+ unsigned int queue_log_realtime_use_gmt:1;
} logfiles = { 1 };
static char hostname[MAXHOSTNAMELEN];
+AST_THREADSTORAGE_RAW(in_safe_log);
+
+struct logchannel;
+struct logmsg;
+
+struct logformatter {
+ /* The name of the log formatter */
+ const char *name;
+ /* Pointer to the function that will format the log */
+ int (* const format_log)(struct logchannel *channel, struct logmsg *msg, char *buf, size_t size);
+};
enum logtypes {
LOGTYPE_SYSLOG,
};
struct logchannel {
+ /*! How the logs sent to this channel will be formatted */
+ struct logformatter formatter;
/*! What to log to this channel */
unsigned int logmask;
/*! If this channel is disabled or not */
int disabled;
/*! syslog facility */
int facility;
+ /*! Verbosity level. (-1 if use option_verbose for the level.) */
+ int verbosity;
/*! Type of log channel */
enum logtypes type;
/*! logfile logging file pointer */
AST_LIST_ENTRY(logchannel) list;
/*! Line number from configuration file */
int lineno;
+ /*! Whether this log channel was created dynamically */
+ int dynamic;
/*! Components (levels) from last config load */
char components[0];
};
struct logmsg {
enum logmsgtypes type;
int level;
+ int sublevel;
int line;
- long process_id;
+ int lwp;
+ ast_callid callid;
AST_DECLARE_STRING_FIELDS(
AST_STRING_FIELD(date);
AST_STRING_FIELD(file);
AST_LIST_ENTRY(logmsg) list;
};
+static void logmsg_free(struct logmsg *msg)
+{
+ ast_string_field_free_memory(msg);
+ ast_free(msg);
+}
+
static AST_LIST_HEAD_STATIC(logmsgs, logmsg);
static pthread_t logthread = AST_PTHREADT_NULL;
static ast_cond_t logcond;
* logchannels list.
*/
-static char *levels[32] = {
+static char *levels[NUMLOGLEVELS] = {
"DEBUG",
"---EVENT---", /* no longer used */
"NOTICE",
};
/*! \brief Colors used in the console for logging */
-static const int colors[32] = {
+static const int colors[NUMLOGLEVELS] = {
COLOR_BRGREEN,
COLOR_BRBLUE, /* no longer used */
COLOR_YELLOW,
};
AST_THREADSTORAGE(verbose_buf);
+AST_THREADSTORAGE(verbose_build_buf);
#define VERBOSE_BUF_INIT_SIZE 256
AST_THREADSTORAGE(log_buf);
#define LOG_BUF_INIT_SIZE 256
-static unsigned int make_components(const char *s, int lineno)
+static int format_log_json(struct logchannel *channel, struct logmsg *msg, char *buf, size_t size)
+{
+ struct ast_json *json;
+ char *str;
+ char call_identifier_str[13];
+ size_t json_str_len;
+
+ if (msg->callid) {
+ snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", msg->callid);
+ } else {
+ call_identifier_str[0] = '\0';
+ }
+
+ json = ast_json_pack("{s: s, s: s, "
+ "s: {s: i, s: s} "
+ "s: {s: {s: s, s: s, s: i}, "
+ "s: s, s: s} }",
+ "hostname", ast_config_AST_SYSTEM_NAME,
+ "timestamp", msg->date,
+ "identifiers",
+ "lwp", msg->lwp,
+ "callid", S_OR(call_identifier_str, ""),
+ "logmsg",
+ "location",
+ "filename", msg->file,
+ "function", msg->function,
+ "line", msg->line,
+ "level", msg->level_name,
+ "message", msg->message);
+ if (!json) {
+ return -1;
+ }
+
+ str = ast_json_dump_string(json);
+ if (!str) {
+ ast_json_unref(json);
+ return -1;
+ }
+
+ ast_copy_string(buf, str, size);
+ json_str_len = strlen(str);
+ if (json_str_len > size - 1) {
+ json_str_len = size - 1;
+ }
+ buf[json_str_len] = '\n';
+ buf[json_str_len + 1] = '\0';
+
+ term_strip(buf, buf, size);
+
+ ast_json_free(str);
+ ast_json_unref(json);
+
+ return 0;
+}
+
+static struct logformatter logformatter_json = {
+ .name = "json",
+ .format_log = format_log_json
+};
+
+static int logger_add_verbose_magic(struct logmsg *logmsg, char *buf, size_t size)
+{
+ const char *p;
+ const char *fmt;
+ struct ast_str *prefixed;
+ signed char magic = logmsg->sublevel > 9 ? -10 : -logmsg->sublevel - 1; /* 0 => -1, 1 => -2, etc. Can't pass NUL, as it is EOS-delimiter */
+
+ /* For compatibility with modules still calling ast_verbose() directly instead of using ast_verb() */
+ if (logmsg->sublevel < 0) {
+ if (!strncmp(logmsg->message, VERBOSE_PREFIX_4, strlen(VERBOSE_PREFIX_4))) {
+ magic = -5;
+ } else if (!strncmp(logmsg->message, VERBOSE_PREFIX_3, strlen(VERBOSE_PREFIX_3))) {
+ magic = -4;
+ } else if (!strncmp(logmsg->message, VERBOSE_PREFIX_2, strlen(VERBOSE_PREFIX_2))) {
+ magic = -3;
+ } else if (!strncmp(logmsg->message, VERBOSE_PREFIX_1, strlen(VERBOSE_PREFIX_1))) {
+ magic = -2;
+ } else {
+ magic = -1;
+ }
+ }
+
+ if (!(prefixed = ast_str_thread_get(&verbose_buf, VERBOSE_BUF_INIT_SIZE))) {
+ return -1;
+ }
+
+ ast_str_reset(prefixed);
+
+ /* for every newline found in the buffer add verbose prefix data */
+ fmt = logmsg->message;
+ do {
+ if (!(p = strchr(fmt, '\n'))) {
+ p = strchr(fmt, '\0') - 1;
+ }
+ ++p;
+
+ ast_str_append(&prefixed, 0, "%c", (char)magic);
+ ast_str_append_substr(&prefixed, 0, fmt, p - fmt);
+ fmt = p;
+ } while (p && *p);
+
+ snprintf(buf, size, "%s", ast_str_buffer(prefixed));
+
+ return 0;
+}
+
+static int format_log_default(struct logchannel *chan, struct logmsg *msg, char *buf, size_t size)
+{
+ char call_identifier_str[13];
+
+ if (msg->callid) {
+ snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", msg->callid);
+ } else {
+ call_identifier_str[0] = '\0';
+ }
+
+ switch (chan->type) {
+ case LOGTYPE_SYSLOG:
+ snprintf(buf, size, "%s[%d]%s: %s:%d in %s: %s",
+ levels[msg->level], msg->lwp, call_identifier_str, msg->file,
+ msg->line, msg->function, msg->message);
+ term_strip(buf, buf, size);
+ break;
+ case LOGTYPE_FILE:
+ snprintf(buf, size, "[%s] %s[%d]%s %s: %s",
+ msg->date, msg->level_name, msg->lwp, call_identifier_str,
+ msg->file, msg->message);
+ term_strip(buf, buf, size);
+ break;
+ case LOGTYPE_CONSOLE:
+ {
+ char linestr[32];
+
+ /*
+ * Verbose messages are interpreted by console channels in their own
+ * special way
+ */
+ if (msg->level == __LOG_VERBOSE) {
+ return logger_add_verbose_magic(msg, buf, size);
+ }
+
+ /* Turn the numeric line number into a string for colorization */
+ snprintf(linestr, sizeof(linestr), "%d", msg->line);
+
+ snprintf(buf, size, "[%s] " COLORIZE_FMT "[%d]%s: " COLORIZE_FMT ":" COLORIZE_FMT " " COLORIZE_FMT ": %s",
+ msg->date,
+ COLORIZE(colors[msg->level], 0, msg->level_name),
+ msg->lwp,
+ call_identifier_str,
+ COLORIZE(COLOR_BRWHITE, 0, msg->file),
+ COLORIZE(COLOR_BRWHITE, 0, linestr),
+ COLORIZE(COLOR_BRWHITE, 0, msg->function),
+ msg->message);
+ }
+ break;
+ }
+
+ return 0;
+}
+
+static struct logformatter logformatter_default = {
+ .name = "default",
+ .format_log = format_log_default,
+};
+
+static void make_components(struct logchannel *chan)
{
char *w;
- unsigned int res = 0;
- char *stringp = ast_strdupa(s);
+ unsigned int logmask = 0;
+ char *stringp = ast_strdupa(chan->components);
unsigned int x;
+ unsigned int verb_level;
- while ((w = strsep(&stringp, ","))) {
- w = ast_skip_blanks(w);
+ /* Default to using option_verbose as the verbosity level of the logging channel. */
+ verb_level = -1;
+
+ w = strchr(stringp, '[');
+ if (w) {
+ char *end = strchr(w + 1, ']');
+ if (!end) {
+ fprintf(stderr, "Logger Warning: bad formatter definition for %s in logger.conf\n", chan->filename);
+ } else {
+ char *formatter_name = w + 1;
+
+ *end = '\0';
+ stringp = end + 1;
+
+ if (!strcasecmp(formatter_name, "json")) {
+ memcpy(&chan->formatter, &logformatter_json, sizeof(chan->formatter));
+ } else if (!strcasecmp(formatter_name, "default")) {
+ memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
+ } else {
+ fprintf(stderr, "Logger Warning: Unknown formatter definition %s for %s in logger.conf; using 'default'\n",
+ formatter_name, chan->filename);
+ memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
+ }
+ }
+ }
+
+ if (!chan->formatter.name) {
+ memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
+ }
+ while ((w = strsep(&stringp, ","))) {
+ w = ast_strip(w);
+ if (ast_strlen_zero(w)) {
+ continue;
+ }
if (!strcmp(w, "*")) {
- res = 0xFFFFFFFF;
- break;
- } else for (x = 0; x < ARRAY_LEN(levels); x++) {
- if (levels[x] && !strcasecmp(w, levels[x])) {
- res |= (1 << x);
- break;
+ logmask = 0xFFFFFFFF;
+ } else if (!strncasecmp(w, "verbose(", 8)) {
+ if (levels[__LOG_VERBOSE] && sscanf(w + 8, "%30u)", &verb_level) == 1) {
+ logmask |= (1 << __LOG_VERBOSE);
+ }
+ } else {
+ for (x = 0; x < ARRAY_LEN(levels); ++x) {
+ if (levels[x] && !strcasecmp(w, levels[x])) {
+ logmask |= (1 << x);
+ break;
+ }
}
}
}
+ if (chan->type == LOGTYPE_CONSOLE) {
+ /*
+ * Force to use the root console verbose level so if the
+ * user specified any verbose level then it does not interfere
+ * with calculating the ast_verb_sys_level value.
+ */
+ chan->verbosity = -1;
+ logmask |= (1 << __LOG_VERBOSE);
+ } else {
+ chan->verbosity = verb_level;
+ }
+ chan->logmask = logmask;
+}
- return res;
+/*!
+ * \brief create the filename that will be used for a logger channel.
+ *
+ * \param channel The name of the logger channel
+ * \param[out] filename The filename for the logger channel
+ * \param size The size of the filename buffer
+ */
+static void make_filename(const char *channel, char *filename, size_t size)
+{
+ const char *log_dir_prefix = "";
+ const char *log_dir_separator = "";
+
+ *filename = '\0';
+
+ if (!strcasecmp(channel, "console")) {
+ return;
+ }
+
+ if (!strncasecmp(channel, "syslog", 6)) {
+ ast_copy_string(filename, channel, size);
+ return;
+ }
+
+ /* It's a filename */
+
+ if (channel[0] != '/') {
+ log_dir_prefix = ast_config_AST_LOG_DIR;
+ log_dir_separator = "/";
+ }
+
+ if (!ast_strlen_zero(hostname)) {
+ snprintf(filename, size, "%s%s%s.%s",
+ log_dir_prefix, log_dir_separator, channel, hostname);
+ } else {
+ snprintf(filename, size, "%s%s%s",
+ log_dir_prefix, log_dir_separator, channel);
+ }
+}
+
+/*!
+ * \brief Find a particular logger channel by name
+ *
+ * \pre logchannels list is locked
+ *
+ * \param channel The name of the logger channel to find
+ * \retval non-NULL The corresponding logger channel
+ * \retval NULL Unable to find a logger channel with that particular name
+ */
+static struct logchannel *find_logchannel(const char *channel)
+{
+ char filename[PATH_MAX];
+ struct logchannel *chan;
+
+ make_filename(channel, filename, sizeof(filename));
+
+ AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
+ if (!strcmp(chan->filename, filename)) {
+ return chan;
+ }
+ }
+
+ return NULL;
}
-static struct logchannel *make_logchannel(const char *channel, const char *components, int lineno)
+static struct logchannel *make_logchannel(const char *channel, const char *components, int lineno, int dynamic)
{
struct logchannel *chan;
char *facility;
+ struct ast_tm tm;
+ struct timeval now = ast_tvnow();
+ char datestring[256];
if (ast_strlen_zero(channel) || !(chan = ast_calloc(1, sizeof(*chan) + strlen(components) + 1)))
return NULL;
strcpy(chan->components, components);
chan->lineno = lineno;
+ chan->dynamic = dynamic;
+
+ make_filename(channel, chan->filename, sizeof(chan->filename));
if (!strcasecmp(channel, "console")) {
chan->type = LOGTYPE_CONSOLE;
}
chan->type = LOGTYPE_SYSLOG;
- ast_copy_string(chan->filename, channel, sizeof(chan->filename));
openlog("asterisk", LOG_PID, chan->facility);
} else {
- if (!ast_strlen_zero(hostname)) {
- snprintf(chan->filename, sizeof(chan->filename), "%s/%s.%s",
- channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel, hostname);
+ if (!(chan->fileptr = fopen(chan->filename, "a"))) {
+ /* Can't do real logging here since we're called with a lock
+ * so log to any attached consoles */
+ ast_console_puts_mutable("ERROR: Unable to open log file '", __LOG_ERROR);
+ ast_console_puts_mutable(chan->filename, __LOG_ERROR);
+ ast_console_puts_mutable("': ", __LOG_ERROR);
+ ast_console_puts_mutable(strerror(errno), __LOG_ERROR);
+ ast_console_puts_mutable("'\n", __LOG_ERROR);
+ ast_free(chan);
+ return NULL;
} else {
- snprintf(chan->filename, sizeof(chan->filename), "%s/%s",
- channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel);
+ /* Create our date/time */
+ ast_localtime(&now, &tm, NULL);
+ ast_strftime(datestring, sizeof(datestring), dateformat, &tm);
+
+ fprintf(chan->fileptr, "[%s] Asterisk %s built by %s @ %s on a %s running %s on %s\n",
+ datestring, ast_get_version(), ast_build_user, ast_build_hostname,
+ ast_build_machine, ast_build_os, ast_build_date);
+ fflush(chan->fileptr);
}
- if (!(chan->fileptr = fopen(chan->filename, "a"))) {
- /* Can't log here, since we're called with a lock */
- fprintf(stderr, "Logger Warning: Unable to open log file '%s': %s\n", chan->filename, strerror(errno));
- }
chan->type = LOGTYPE_FILE;
}
- chan->logmask = make_components(chan->components, lineno);
+ make_components(chan);
return chan;
}
-static void init_logger_chain(int locked)
+/* \brief Read config, setup channels.
+ * \param altconf Alternate configuration file to read.
+ *
+ * \pre logchannels list is write locked
+ *
+ * \retval 0 Success
+ * \retval -1 No config found or Failed
+ */
+static int init_logger_chain(const char *altconf)
{
struct logchannel *chan;
struct ast_config *cfg;
const char *s;
struct ast_flags config_flags = { 0 };
- if (!(cfg = ast_config_load2("logger.conf", "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID)
- return;
+ if (!(cfg = ast_config_load2(S_OR(altconf, "logger.conf"), "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
+ cfg = NULL;
+ }
+
+ /* Set defaults */
+ hostname[0] = '\0';
+ display_callids = 1;
+ memset(&logfiles, 0, sizeof(logfiles));
+ logfiles.queue_log = 1;
+ ast_copy_string(dateformat, "%b %e %T", sizeof(dateformat));
+ ast_copy_string(queue_log_name, QUEUELOG, sizeof(queue_log_name));
+ exec_after_rotate[0] = '\0';
+ rotatestrategy = SEQUENTIAL;
/* delete our list of log channels */
- if (!locked)
- AST_RWLIST_WRLOCK(&logchannels);
- while ((chan = AST_RWLIST_REMOVE_HEAD(&logchannels, list)))
+ while ((chan = AST_RWLIST_REMOVE_HEAD(&logchannels, list))) {
ast_free(chan);
+ }
global_logmask = 0;
- if (!locked)
- AST_RWLIST_UNLOCK(&logchannels);
-
+
errno = 0;
/* close syslog */
closelog();
-
+
/* If no config file, we're fine, set default options. */
if (!cfg) {
- if (errno)
- fprintf(stderr, "Unable to open logger.conf: %s; default settings will be used.\n", strerror(errno));
- else
- fprintf(stderr, "Errors detected in logger.conf: see above; default settings will be used.\n");
- if (!(chan = ast_calloc(1, sizeof(*chan))))
- return;
+ if (!(chan = ast_calloc(1, sizeof(*chan) + 1))) {
+ fprintf(stderr, "Failed to initialize default logging\n");
+ return -1;
+ }
chan->type = LOGTYPE_CONSOLE;
- chan->logmask = __LOG_WARNING | __LOG_NOTICE | __LOG_ERROR;
- if (!locked)
- AST_RWLIST_WRLOCK(&logchannels);
+ chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR)
+ | (1 << __LOG_VERBOSE);
+ memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
+
AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
global_logmask |= chan->logmask;
- if (!locked)
- AST_RWLIST_UNLOCK(&logchannels);
- return;
+
+ return -1;
}
-
+
if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) {
if (ast_true(s)) {
if (gethostname(hostname, sizeof(hostname) - 1)) {
ast_copy_string(hostname, "unknown", sizeof(hostname));
fprintf(stderr, "What box has no hostname???\n");
}
- } else
- hostname[0] = '\0';
- } else
- hostname[0] = '\0';
- if ((s = ast_variable_retrieve(cfg, "general", "dateformat")))
+ }
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "display_callids"))) {
+ display_callids = ast_true(s);
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "dateformat"))) {
ast_copy_string(dateformat, s, sizeof(dateformat));
- else
- ast_copy_string(dateformat, "%b %e %T", sizeof(dateformat));
- if ((s = ast_variable_retrieve(cfg, "general", "queue_log")))
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "queue_log"))) {
logfiles.queue_log = ast_true(s);
- if ((s = ast_variable_retrieve(cfg, "general", "queue_log_name")))
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "queue_log_to_file"))) {
+ logfiles.queue_log_to_file = ast_true(s);
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "queue_log_name"))) {
ast_copy_string(queue_log_name, s, sizeof(queue_log_name));
- if ((s = ast_variable_retrieve(cfg, "general", "exec_after_rotate")))
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "queue_log_realtime_use_gmt"))) {
+ logfiles.queue_log_realtime_use_gmt = ast_true(s);
+ }
+ if ((s = ast_variable_retrieve(cfg, "general", "exec_after_rotate"))) {
ast_copy_string(exec_after_rotate, s, sizeof(exec_after_rotate));
+ }
if ((s = ast_variable_retrieve(cfg, "general", "rotatestrategy"))) {
- if (strcasecmp(s, "timestamp") == 0)
+ if (strcasecmp(s, "timestamp") == 0) {
rotatestrategy = TIMESTAMP;
- else if (strcasecmp(s, "rotate") == 0)
+ } else if (strcasecmp(s, "rotate") == 0) {
rotatestrategy = ROTATE;
- else if (strcasecmp(s, "sequential") == 0)
+ } else if (strcasecmp(s, "sequential") == 0) {
rotatestrategy = SEQUENTIAL;
- else
+ } else if (strcasecmp(s, "none") == 0) {
+ rotatestrategy = NONE;
+ } else {
fprintf(stderr, "Unknown rotatestrategy: %s\n", s);
+ }
} else {
if ((s = ast_variable_retrieve(cfg, "general", "rotatetimestamp"))) {
rotatestrategy = ast_true(s) ? TIMESTAMP : SEQUENTIAL;
fprintf(stderr, "rotatetimestamp option has been deprecated. Please use rotatestrategy instead.\n");
}
}
+ if ((s = ast_variable_retrieve(cfg, "general", "logger_queue_limit"))) {
+ if (sscanf(s, "%30d", &logger_queue_limit) != 1) {
+ fprintf(stderr, "logger_queue_limit has an invalid value. Leaving at default of %d.\n",
+ logger_queue_limit);
+ }
+ if (logger_queue_limit < 10) {
+ fprintf(stderr, "logger_queue_limit must be >= 10. Setting to 10.\n");
+ logger_queue_limit = 10;
+ }
+ }
- if (!locked)
- AST_RWLIST_WRLOCK(&logchannels);
var = ast_variable_browse(cfg, "logfiles");
for (; var; var = var->next) {
- if (!(chan = make_logchannel(var->name, var->value, var->lineno)))
+ if (!(chan = make_logchannel(var->name, var->value, var->lineno, 0))) {
+ /* Print error message directly to the consoles since the lock is held
+ * and we don't want to unlock with the list partially built */
+ ast_console_puts_mutable("ERROR: Unable to create log channel '", __LOG_ERROR);
+ ast_console_puts_mutable(var->name, __LOG_ERROR);
+ ast_console_puts_mutable("'\n", __LOG_ERROR);
continue;
+ }
AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
global_logmask |= chan->logmask;
}
- if (!locked)
- AST_RWLIST_UNLOCK(&logchannels);
+
+ if (qlog) {
+ fclose(qlog);
+ qlog = NULL;
+ }
ast_config_destroy(cfg);
+
+ return 0;
}
void ast_child_verbose(int level, const char *fmt, ...)
va_list ap, aq;
int size;
- /* Don't bother, if the level isn't that high */
- if (option_verbose < level) {
- return;
- }
-
va_start(ap, fmt);
va_copy(aq, ap);
if ((size = vsnprintf(msg, 0, fmt, ap)) < 0) {
void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
{
va_list ap;
+ struct timeval tv;
+ struct ast_tm tm;
char qlog_msg[8192];
int qlog_len;
- char time_str[16];
+ char time_str[30];
+
+ if (!logger_initialized) {
+ /* You are too early. We are not open yet! */
+ return;
+ }
+ if (!queuelog_init) {
+ /* We must initialize now since someone is trying to log something. */
+ logger_queue_start();
+ }
if (ast_check_realtime("queue_log")) {
+ tv = ast_tvnow();
+ ast_localtime(&tv, &tm, logfiles.queue_log_realtime_use_gmt ? "GMT" : NULL);
+ ast_strftime(time_str, sizeof(time_str), "%F %T.%6q", &tm);
va_start(ap, fmt);
vsnprintf(qlog_msg, sizeof(qlog_msg), fmt, ap);
va_end(ap);
- snprintf(time_str, sizeof(time_str), "%ld", (long)time(NULL));
- ast_store_realtime("queue_log", "time", time_str,
- "callid", callid,
- "queuename", queuename,
- "agent", agent,
- "event", event,
- "data", qlog_msg,
- SENTINEL);
- } else {
- if (qlog) {
- va_start(ap, fmt);
- qlog_len = snprintf(qlog_msg, sizeof(qlog_msg), "%ld|%s|%s|%s|%s|", (long)time(NULL), callid, queuename, agent, event);
- vsnprintf(qlog_msg + qlog_len, sizeof(qlog_msg) - qlog_len, fmt, ap);
- va_end(ap);
+ if (logfiles.queue_adaptive_realtime) {
+ AST_DECLARE_APP_ARGS(args,
+ AST_APP_ARG(data)[5];
+ );
+ AST_NONSTANDARD_APP_ARGS(args, qlog_msg, '|');
+ /* Ensure fields are large enough to receive data */
+ ast_realtime_require_field("queue_log",
+ "data1", RQ_CHAR, strlen(S_OR(args.data[0], "")),
+ "data2", RQ_CHAR, strlen(S_OR(args.data[1], "")),
+ "data3", RQ_CHAR, strlen(S_OR(args.data[2], "")),
+ "data4", RQ_CHAR, strlen(S_OR(args.data[3], "")),
+ "data5", RQ_CHAR, strlen(S_OR(args.data[4], "")),
+ SENTINEL);
+
+ /* Store the log */
+ ast_store_realtime("queue_log", "time", time_str,
+ "callid", callid,
+ "queuename", queuename,
+ "agent", agent,
+ "event", event,
+ "data1", S_OR(args.data[0], ""),
+ "data2", S_OR(args.data[1], ""),
+ "data3", S_OR(args.data[2], ""),
+ "data4", S_OR(args.data[3], ""),
+ "data5", S_OR(args.data[4], ""),
+ SENTINEL);
+ } else {
+ ast_store_realtime("queue_log", "time", time_str,
+ "callid", callid,
+ "queuename", queuename,
+ "agent", agent,
+ "event", event,
+ "data", qlog_msg,
+ SENTINEL);
+ }
+
+ if (!logfiles.queue_log_to_file) {
+ return;
}
+ }
+
+ if (qlog) {
+ va_start(ap, fmt);
+ qlog_len = snprintf(qlog_msg, sizeof(qlog_msg), "%ld|%s|%s|%s|%s|", (long)time(NULL), callid, queuename, agent, event);
+ vsnprintf(qlog_msg + qlog_len, sizeof(qlog_msg) - qlog_len, fmt, ap);
+ va_end(ap);
AST_RWLIST_RDLOCK(&logchannels);
if (qlog) {
fprintf(qlog, "%s\n", qlog_msg);
char *suffixes[4] = { "", ".gz", ".bz2", ".Z" };
switch (rotatestrategy) {
+ case NONE:
+ /* No rotation */
+ break;
case SEQUENTIAL:
for (x = 0; ; x++) {
snprintf(new, sizeof(new), "%s.%d", filename, x);
if (rename(filename, new)) {
fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
res = -1;
+ } else {
+ filename = new;
}
break;
case TIMESTAMP:
if (rename(filename, new)) {
fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
res = -1;
+ } else {
+ filename = new;
}
break;
case ROTATE:
if (rename(filename, new)) {
fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
res = -1;
+ } else {
+ filename = new;
}
}
if (!ast_strlen_zero(exec_after_rotate)) {
struct ast_channel *c = ast_dummy_channel_alloc();
char buf[512];
+
pbx_builtin_setvar_helper(c, "filename", filename);
pbx_substitute_variables_helper(c, exec_after_rotate, buf, sizeof(buf));
+ if (c) {
+ c = ast_channel_unref(c);
+ }
if (ast_safe_system(buf) == -1) {
ast_log(LOG_WARNING, "error executing '%s'\n", buf);
}
- c = ast_channel_release(c);
}
return res;
}
-static int reload_logger(int rotate)
+/*!
+ * \internal
+ * \brief Start the realtime queue logging if configured.
+ *
+ * \retval TRUE if not to open queue log file.
+ */
+static int logger_queue_rt_start(void)
+{
+ if (ast_check_realtime("queue_log")) {
+ if (!ast_realtime_require_field("queue_log",
+ "time", RQ_DATETIME, 26,
+ "data1", RQ_CHAR, 20,
+ "data2", RQ_CHAR, 20,
+ "data3", RQ_CHAR, 20,
+ "data4", RQ_CHAR, 20,
+ "data5", RQ_CHAR, 20,
+ SENTINEL)) {
+ logfiles.queue_adaptive_realtime = 1;
+ } else {
+ logfiles.queue_adaptive_realtime = 0;
+ }
+
+ if (!logfiles.queue_log_to_file) {
+ /* Don't open the log file. */
+ return 1;
+ }
+ }
+ return 0;
+}
+
+/*!
+ * \internal
+ * \brief Rotate the queue log file and restart.
+ *
+ * \param queue_rotate Log queue rotation mode.
+ *
+ * \note Assumes logchannels is write locked on entry.
+ *
+ * \retval 0 on success.
+ * \retval -1 on error.
+ */
+static int logger_queue_restart(int queue_rotate)
+{
+ int res = 0;
+ char qfname[PATH_MAX];
+
+ if (logger_queue_rt_start()) {
+ return res;
+ }
+
+ snprintf(qfname, sizeof(qfname), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
+ if (qlog) {
+ /* Just in case it was still open. */
+ fclose(qlog);
+ qlog = NULL;
+ }
+ if (queue_rotate) {
+ rotate_file(qfname);
+ }
+
+ /* Open the log file. */
+ qlog = fopen(qfname, "a");
+ if (!qlog) {
+ ast_log(LOG_ERROR, "Unable to create queue log: %s\n", strerror(errno));
+ res = -1;
+ }
+ return res;
+}
+
+static int reload_logger(int rotate, const char *altconf)
{
- char old[PATH_MAX] = "";
int queue_rotate = rotate;
struct logchannel *f;
int res = 0;
- struct stat st;
AST_RWLIST_WRLOCK(&logchannels);
if (qlog) {
if (rotate < 0) {
/* Check filesize - this one typically doesn't need an auto-rotate */
- snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
- if (stat(old, &st) != 0 || st.st_size > 0x40000000) { /* Arbitrarily, 1 GB */
+ if (ftello(qlog) > 0x40000000) { /* Arbitrarily, 1 GB */
fclose(qlog);
qlog = NULL;
- } else
+ } else {
queue_rotate = 0;
+ }
} else {
fclose(qlog);
qlog = NULL;
}
- } else
+ } else {
queue_rotate = 0;
+ }
ast_mkdir(ast_config_AST_LOG_DIR, 0777);
AST_RWLIST_TRAVERSE(&logchannels, f, list) {
if (f->disabled) {
f->disabled = 0; /* Re-enable logging at reload */
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a logging channel is re-enabled after a reload operation.</synopsis>
+ <syntax>
+ <parameter name="Channel">
+ <para>The name of the logging channel.</para>
+ </parameter>
+ </syntax>
+ </managerEventInstance>
+ ***/
manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: Yes\r\n", f->filename);
}
if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) {
+ int rotate_this = 0;
+ if (rotatestrategy != NONE && ftello(f->fileptr) > 0x40000000) { /* Arbitrarily, 1 GB */
+ /* Be more proactive about rotating massive log files */
+ rotate_this = 1;
+ }
fclose(f->fileptr); /* Close file */
f->fileptr = NULL;
- if (rotate)
+ if (rotate || rotate_this) {
rotate_file(f->filename);
+ }
}
}
filesize_reload_needed = 0;
- init_logger_chain(1 /* locked */);
+ init_logger_chain(altconf);
+ ast_unload_realtime("queue_log");
if (logfiles.queue_log) {
- snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
- if (queue_rotate)
- rotate_file(old);
-
- qlog = fopen(old, "a");
- if (qlog) {
- AST_RWLIST_UNLOCK(&logchannels);
- ast_queue_log("NONE", "NONE", "NONE", "CONFIGRELOAD", "%s", "");
- AST_RWLIST_WRLOCK(&logchannels);
- ast_verb(1, "Asterisk Queue Logger restarted\n");
- } else {
- ast_log(LOG_ERROR, "Unable to create queue log: %s\n", strerror(errno));
- res = -1;
- }
+ res = logger_queue_restart(queue_rotate);
+ AST_RWLIST_UNLOCK(&logchannels);
+ ast_verb_update();
+ ast_queue_log("NONE", "NONE", "NONE", "CONFIGRELOAD", "%s", "");
+ ast_verb(1, "Asterisk Queue Logger restarted\n");
+ } else {
+ AST_RWLIST_UNLOCK(&logchannels);
+ ast_verb_update();
}
- AST_RWLIST_UNLOCK(&logchannels);
-
return res;
}
a full Asterisk reload) */
int logger_reload(void)
{
- if(reload_logger(0))
+ if (reload_logger(0, NULL)) {
return RESULT_FAILURE;
+ }
return RESULT_SUCCESS;
}
switch (cmd) {
case CLI_INIT:
e->command = "logger reload";
- e->usage =
- "Usage: logger reload\n"
+ e->usage =
+ "Usage: logger reload [<alt-conf>]\n"
" Reloads the logger subsystem state. Use after restarting syslogd(8) if you are using syslog logging.\n";
return NULL;
case CLI_GENERATE:
return NULL;
}
- if (reload_logger(0)) {
+ if (reload_logger(0, a->argc == 3 ? a->argv[2] : NULL)) {
ast_cli(a->fd, "Failed to reload the logger\n");
return CLI_FAILURE;
}
switch (cmd) {
case CLI_INIT:
e->command = "logger rotate";
- e->usage =
+ e->usage =
"Usage: logger rotate\n"
" Rotates and Reopens the log files.\n";
return NULL;
case CLI_GENERATE:
- return NULL;
+ return NULL;
}
- if (reload_logger(1)) {
+ if (reload_logger(1, NULL)) {
ast_cli(a->fd, "Failed to reload the logger and rotate log files\n");
return CLI_FAILURE;
- }
+ }
return CLI_SUCCESS;
}
+int ast_logger_rotate()
+{
+ return reload_logger(1, NULL);
+}
+
+int ast_logger_rotate_channel(const char *log_channel)
+{
+ struct logchannel *f;
+ int success = AST_LOGGER_FAILURE;
+ char filename[PATH_MAX];
+
+ make_filename(log_channel, filename, sizeof(filename));
+
+ AST_RWLIST_WRLOCK(&logchannels);
+
+ ast_mkdir(ast_config_AST_LOG_DIR, 0644);
+
+ AST_RWLIST_TRAVERSE(&logchannels, f, list) {
+ if (f->disabled) {
+ f->disabled = 0; /* Re-enable logging at reload */
+ manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: Yes\r\n",
+ f->filename);
+ }
+ if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) {
+ fclose(f->fileptr); /* Close file */
+ f->fileptr = NULL;
+ if (strcmp(filename, f->filename) == 0) {
+ rotate_file(f->filename);
+ success = AST_LOGGER_SUCCESS;
+ }
+ }
+ }
+
+ init_logger_chain(NULL);
+
+ AST_RWLIST_UNLOCK(&logchannels);
+
+ return success;
+}
+
static char *handle_logger_set_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int x;
switch (cmd) {
case CLI_INIT:
e->command = "logger set level {DEBUG|NOTICE|WARNING|ERROR|VERBOSE|DTMF} {on|off}";
- e->usage =
+ e->usage =
"Usage: logger set level {DEBUG|NOTICE|WARNING|ERROR|VERBOSE|DTMF} {on|off}\n"
" Set a specific log level to enabled/disabled for this console.\n";
return NULL;
return CLI_SUCCESS;
}
+int ast_logger_get_channels(int (*logentry)(const char *channel, const char *type,
+ const char *status, const char *configuration, void *data), void *data)
+{
+ struct logchannel *chan;
+ struct ast_str *configs = ast_str_create(64);
+ int res = AST_LOGGER_SUCCESS;
+
+ if (!configs) {
+ return AST_LOGGER_ALLOC_ERROR;
+ }
+
+ AST_RWLIST_RDLOCK(&logchannels);
+ AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
+ unsigned int level;
+
+ ast_str_reset(configs);
+
+ for (level = 0; level < ARRAY_LEN(levels); level++) {
+ if ((chan->logmask & (1 << level)) && levels[level]) {
+ ast_str_append(&configs, 0, "%s ", levels[level]);
+ }
+ }
+
+ res = logentry(chan->filename, chan->type == LOGTYPE_CONSOLE ? "Console" :
+ (chan->type == LOGTYPE_SYSLOG ? "Syslog" : "File"), chan->disabled ?
+ "Disabled" : "Enabled", ast_str_buffer(configs), data);
+
+ if (res) {
+ AST_RWLIST_UNLOCK(&logchannels);
+ ast_free(configs);
+ configs = NULL;
+ return AST_LOGGER_FAILURE;
+ }
+ }
+ AST_RWLIST_UNLOCK(&logchannels);
+
+ ast_free(configs);
+ configs = NULL;
+
+ return AST_LOGGER_SUCCESS;
+}
+
/*! \brief CLI command to show logging system configuration */
static char *handle_logger_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
-#define FORMATL "%-35.35s %-8.8s %-9.9s "
+#define FORMATL "%-35.35s %-8.8s %-10.10s %-9.9s "
struct logchannel *chan;
switch (cmd) {
case CLI_INIT:
e->command = "logger show channels";
- e->usage =
+ e->usage =
"Usage: logger show channels\n"
" List configured logger channels.\n";
return NULL;
case CLI_GENERATE:
- return NULL;
+ return NULL;
}
- ast_cli(a->fd, FORMATL, "Channel", "Type", "Status");
+ ast_cli(a->fd, "Logger queue limit: %d\n\n", logger_queue_limit);
+ ast_cli(a->fd, FORMATL, "Channel", "Type", "Formatter", "Status");
ast_cli(a->fd, "Configuration\n");
- ast_cli(a->fd, FORMATL, "-------", "----", "------");
+ ast_cli(a->fd, FORMATL, "-------", "----", "---------", "------");
ast_cli(a->fd, "-------------\n");
AST_RWLIST_RDLOCK(&logchannels);
AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
unsigned int level;
ast_cli(a->fd, FORMATL, chan->filename, chan->type == LOGTYPE_CONSOLE ? "Console" : (chan->type == LOGTYPE_SYSLOG ? "Syslog" : "File"),
+ chan->formatter.name,
chan->disabled ? "Disabled" : "Enabled");
ast_cli(a->fd, " - ");
for (level = 0; level < ARRAY_LEN(levels); level++) {
return CLI_SUCCESS;
}
-struct verb {
- void (*verboser)(const char *string);
- AST_LIST_ENTRY(verb) list;
-};
+int ast_logger_create_channel(const char *log_channel, const char *components)
+{
+ struct logchannel *chan;
+
+ if (ast_strlen_zero(components)) {
+ return AST_LOGGER_DECLINE;
+ }
+
+ AST_RWLIST_WRLOCK(&logchannels);
+
+ chan = find_logchannel(log_channel);
+ if (chan) {
+ AST_RWLIST_UNLOCK(&logchannels);
+ return AST_LOGGER_FAILURE;
+ }
+
+ chan = make_logchannel(log_channel, components, 0, 1);
+ if (!chan) {
+ AST_RWLIST_UNLOCK(&logchannels);
+ return AST_LOGGER_ALLOC_ERROR;
+ }
+
+ AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
+ global_logmask |= chan->logmask;
+
+ AST_RWLIST_UNLOCK(&logchannels);
+
+ return AST_LOGGER_SUCCESS;
+}
+
+static char *handle_logger_add_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "logger add channel";
+ e->usage =
+ "Usage: logger add channel <name> <levels>\n"
+ " Adds a temporary logger channel. This logger channel\n"
+ " will exist until removed or until Asterisk is restarted.\n"
+ " <levels> is a comma-separated list of desired logger\n"
+ " levels such as: verbose,warning,error\n"
+ " An optional formatter may be specified with the levels;\n"
+ " valid values are '[json]' and '[default]'.\n";
+ return NULL;
+ case CLI_GENERATE:
+ return NULL;
+ }
+
+ if (a->argc < 5) {
+ return CLI_SHOWUSAGE;
+ }
+
+ switch (ast_logger_create_channel(a->argv[3], a->argv[4])) {
+ case AST_LOGGER_SUCCESS:
+ return CLI_SUCCESS;
+ case AST_LOGGER_FAILURE:
+ ast_cli(a->fd, "Logger channel '%s' already exists\n", a->argv[3]);
+ return CLI_SUCCESS;
+ case AST_LOGGER_DECLINE:
+ case AST_LOGGER_ALLOC_ERROR:
+ default:
+ ast_cli(a->fd, "ERROR: Unable to create log channel '%s'\n", a->argv[3]);
+ return CLI_FAILURE;
+ }
+}
+
+int ast_logger_remove_channel(const char *log_channel)
+{
+ struct logchannel *chan;
+
+ AST_RWLIST_WRLOCK(&logchannels);
+
+ chan = find_logchannel(log_channel);
+ if (chan && chan->dynamic) {
+ AST_RWLIST_REMOVE(&logchannels, chan, list);
+ } else {
+ AST_RWLIST_UNLOCK(&logchannels);
+ return AST_LOGGER_FAILURE;
+ }
+ AST_RWLIST_UNLOCK(&logchannels);
+
+ if (chan->fileptr) {
+ fclose(chan->fileptr);
+ chan->fileptr = NULL;
+ }
+ ast_free(chan);
+ chan = NULL;
+
+ return AST_LOGGER_SUCCESS;
+}
+
+static char *handle_logger_remove_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+ struct logchannel *chan;
+ int gen_count = 0;
+ char *gen_ret = NULL;
+
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "logger remove channel";
+ e->usage =
+ "Usage: logger remove channel <name>\n"
+ " Removes a temporary logger channel.\n";
+ return NULL;
+ case CLI_GENERATE:
+ if (a->argc > 4 || (a->argc == 4 && a->pos > 3)) {
+ return NULL;
+ }
+ AST_RWLIST_RDLOCK(&logchannels);
+ AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
+ if (chan->dynamic && (ast_strlen_zero(a->argv[3])
+ || !strncmp(a->argv[3], chan->filename, strlen(a->argv[3])))) {
+ if (gen_count == a->n) {
+ gen_ret = ast_strdup(chan->filename);
+ break;
+ }
+ gen_count++;
+ }
+ }
+ AST_RWLIST_UNLOCK(&logchannels);
+ return gen_ret;
+ }
-static AST_RWLIST_HEAD_STATIC(verbosers, verb);
+ if (a->argc < 4) {
+ return CLI_SHOWUSAGE;
+ }
+
+ switch (ast_logger_remove_channel(a->argv[3])) {
+ case AST_LOGGER_SUCCESS:
+ ast_cli(a->fd, "Removed dynamic logger channel '%s'\n", a->argv[3]);
+ return CLI_SUCCESS;
+ case AST_LOGGER_FAILURE:
+ ast_cli(a->fd, "Unable to find dynamic logger channel '%s'\n", a->argv[3]);
+ return CLI_SUCCESS;
+ default:
+ ast_cli(a->fd, "Internal failure attempting to delete dynamic logger channel '%s'\n", a->argv[3]);
+ return CLI_FAILURE;
+ }
+}
static struct ast_cli_entry cli_logger[] = {
AST_CLI_DEFINE(handle_logger_show_channels, "List configured log channels"),
AST_CLI_DEFINE(handle_logger_reload, "Reopens the log files"),
AST_CLI_DEFINE(handle_logger_rotate, "Rotates and reopens the log files"),
- AST_CLI_DEFINE(handle_logger_set_level, "Enables/Disables a specific logging level for this console")
+ AST_CLI_DEFINE(handle_logger_set_level, "Enables/Disables a specific logging level for this console"),
+ AST_CLI_DEFINE(handle_logger_add_channel, "Adds a new logging channel"),
+ AST_CLI_DEFINE(handle_logger_remove_channel, "Removes a logging channel"),
};
static void _handle_SIGXFSZ(int sig)
.sa_flags = SA_RESTART,
};
-static void ast_log_vsyslog(struct logmsg *msg)
-{
- char buf[BUFSIZ];
- int syslog_level = ast_syslog_priority_from_loglevel(msg->level);
-
- if (syslog_level < 0) {
- /* we are locked here, so cannot ast_log() */
- fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", msg->level);
- return;
- }
-
- if (msg->level == __LOG_VERBOSE) {
- snprintf(buf, sizeof(buf), "VERBOSE[%ld]: %s", msg->process_id, msg->message);
- msg->level = __LOG_DEBUG;
- } else if (msg->level == __LOG_DTMF) {
- snprintf(buf, sizeof(buf), "DTMF[%ld]: %s", msg->process_id, msg->message);
- msg->level = __LOG_DEBUG;
- } else {
- snprintf(buf, sizeof(buf), "%s[%ld]: %s:%d in %s: %s",
- levels[msg->level], msg->process_id, msg->file, msg->line, msg->function, msg->message);
- }
-
- term_strip(buf, buf, strlen(buf) + 1);
- syslog(syslog_level, "%s", buf);
-}
-
/*! \brief Print a normal log message to the channels */
static void logger_print_normal(struct logmsg *logmsg)
{
struct logchannel *chan = NULL;
char buf[BUFSIZ];
+ int level = 0;
AST_RWLIST_RDLOCK(&logchannels);
-
if (!AST_RWLIST_EMPTY(&logchannels)) {
AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
+
/* If the channel is disabled, then move on to the next one */
- if (chan->disabled)
+ if (chan->disabled) {
continue;
- /* Check syslog channels */
- if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << logmsg->level))) {
- ast_log_vsyslog(logmsg);
- /* Console channels */
- } else if (chan->type == LOGTYPE_CONSOLE && (chan->logmask & (1 << logmsg->level))) {
- char linestr[128];
- char tmp1[80], tmp2[80], tmp3[80], tmp4[80];
-
- /* If the level is verbose, then skip it */
- if (logmsg->level == __LOG_VERBOSE)
- continue;
-
- /* Turn the numerical line number into a string */
- snprintf(linestr, sizeof(linestr), "%d", logmsg->line);
- /* Build string to print out */
- snprintf(buf, sizeof(buf), "[%s] %s[%ld]: %s:%s %s: %s",
- logmsg->date,
- term_color(tmp1, logmsg->level_name, colors[logmsg->level], 0, sizeof(tmp1)),
- logmsg->process_id,
- term_color(tmp2, logmsg->file, COLOR_BRWHITE, 0, sizeof(tmp2)),
- term_color(tmp3, linestr, COLOR_BRWHITE, 0, sizeof(tmp3)),
- term_color(tmp4, logmsg->function, COLOR_BRWHITE, 0, sizeof(tmp4)),
- logmsg->message);
- /* Print out */
- ast_console_puts_mutable(buf, logmsg->level);
- /* File channels */
- } else if (chan->type == LOGTYPE_FILE && (chan->logmask & (1 << logmsg->level))) {
- int res = 0;
-
- /* If no file pointer exists, skip it */
- if (!chan->fileptr) {
- continue;
+ }
+ if (logmsg->level == __LOG_VERBOSE
+ && (((chan->verbosity < 0) ? option_verbose : chan->verbosity)) < level) {
+ continue;
+ }
+
+ if (!(chan->logmask & (1 << logmsg->level))) {
+ continue;
+ }
+
+ switch (chan->type) {
+ case LOGTYPE_SYSLOG:
+ {
+ int syslog_level = ast_syslog_priority_from_loglevel(logmsg->level);
+
+ if (syslog_level < 0) {
+ /* we are locked here, so cannot ast_log() */
+ fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", logmsg->level);
+ continue;
+ }
+
+ /* Don't use LOG_MAKEPRI because it's broken in glibc<2.17 */
+ syslog_level = chan->facility | syslog_level; /* LOG_MAKEPRI(chan->facility, syslog_level); */
+ if (!chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+ syslog(syslog_level, "%s", buf);
+ }
+ }
+ break;
+ case LOGTYPE_CONSOLE:
+ if (!chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+ ast_console_puts_mutable_full(buf, logmsg->level, logmsg->sublevel);
}
+ break;
+ case LOGTYPE_FILE:
+ {
+ int res = 0;
+
+ if (!chan->fileptr) {
+ continue;
+ }
- /* Print out to the file */
- res = fprintf(chan->fileptr, "[%s] %s[%ld] %s: %s",
- logmsg->date, logmsg->level_name, logmsg->process_id, logmsg->file, term_strip(buf, logmsg->message, BUFSIZ));
- if (res <= 0 && !ast_strlen_zero(logmsg->message)) {
- fprintf(stderr, "**** Asterisk Logging Error: ***********\n");
- if (errno == ENOMEM || errno == ENOSPC)
- fprintf(stderr, "Asterisk logging error: Out of disk space, can't log to log file %s\n", chan->filename);
- else
- fprintf(stderr, "Logger Warning: Unable to write to log file '%s': %s (disabled)\n", chan->filename, strerror(errno));
- manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: No\r\nReason: %d - %s\r\n", chan->filename, errno, strerror(errno));
- chan->disabled = 1;
- } else if (res > 0) {
- fflush(chan->fileptr);
+ if (chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+ continue;
+ }
+
+ /* Print out to the file */
+ res = fprintf(chan->fileptr, "%s", buf);
+ if (res > 0) {
+ fflush(chan->fileptr);
+ } else if (res <= 0 && !ast_strlen_zero(logmsg->message)) {
+ fprintf(stderr, "**** Asterisk Logging Error: ***********\n");
+ if (errno == ENOMEM || errno == ENOSPC) {
+ fprintf(stderr, "Asterisk logging error: Out of disk space, can't log to log file %s\n", chan->filename);
+ } else {
+ fprintf(stderr, "Logger Warning: Unable to write to log file '%s': %s (disabled)\n", chan->filename, strerror(errno));
+ }
+
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a logging channel is disabled.</synopsis>
+ <syntax>
+ <parameter name="Channel">
+ <para>The name of the logging channel.</para>
+ </parameter>
+ </syntax>
+ </managerEventInstance>
+ ***/
+ manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: No\r\nReason: %d - %s\r\n", chan->filename, errno, strerror(errno));
+ chan->disabled = 1;
+ }
}
+ break;
}
}
- } else if (logmsg->level != __LOG_VERBOSE) {
+ } else if (logmsg->level != __LOG_VERBOSE || option_verbose >= logmsg->sublevel) {
fputs(logmsg->message, stdout);
}
/* If we need to reload because of the file size, then do so */
if (filesize_reload_needed) {
- reload_logger(-1);
+ reload_logger(-1, NULL);
ast_verb(1, "Rotated Logs Per SIGXFSZ (Exceeded file size limit)\n");
}
return;
}
-/*! \brief Print a verbose message to the verbosers */
-static void logger_print_verbose(struct logmsg *logmsg)
+static struct logmsg * __attribute__((format(printf, 7, 0))) format_log_message_ap(int level,
+ int sublevel, const char *file, int line, const char *function, ast_callid callid,
+ const char *fmt, va_list ap)
{
- struct verb *v = NULL;
+ struct logmsg *logmsg = NULL;
+ struct ast_str *buf = NULL;
+ struct ast_tm tm;
+ struct timeval now = ast_tvnow();
+ int res = 0;
+ char datestring[256];
- /* Iterate through the list of verbosers and pass them the log message string */
- AST_RWLIST_RDLOCK(&verbosers);
- AST_RWLIST_TRAVERSE(&verbosers, v, list)
- v->verboser(logmsg->message);
- AST_RWLIST_UNLOCK(&verbosers);
+ if (!(buf = ast_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE))) {
+ return NULL;
+ }
- return;
+ /* Build string */
+ res = ast_str_set_va(&buf, BUFSIZ, fmt, ap);
+
+ /* If the build failed, then abort and free this structure */
+ if (res == AST_DYNSTR_BUILD_FAILED) {
+ return NULL;
+ }
+
+ /* Create a new logging message */
+ if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128))) {
+ return NULL;
+ }
+
+ /* Copy string over */
+ ast_string_field_set(logmsg, message, ast_str_buffer(buf));
+
+ /* Set type */
+ if (level == __LOG_VERBOSE) {
+ logmsg->type = LOGMSG_VERBOSE;
+ } else {
+ logmsg->type = LOGMSG_NORMAL;
+ }
+
+ if (display_callids && callid) {
+ logmsg->callid = callid;
+ }
+
+ /* Create our date/time */
+ ast_localtime(&now, &tm, NULL);
+ ast_strftime(datestring, sizeof(datestring), dateformat, &tm);
+ ast_string_field_set(logmsg, date, datestring);
+
+ /* Copy over data */
+ logmsg->level = level;
+ logmsg->sublevel = sublevel;
+ logmsg->line = line;
+ ast_string_field_set(logmsg, level_name, levels[level]);
+ ast_string_field_set(logmsg, file, file);
+ ast_string_field_set(logmsg, function, function);
+ logmsg->lwp = ast_get_tid();
+
+ return logmsg;
+}
+
+static struct logmsg * __attribute__((format(printf, 7, 0))) format_log_message(int level,
+ int sublevel, const char *file, int line, const char *function, ast_callid callid,
+ const char *fmt, ...)
+{
+ struct logmsg *logmsg;
+ va_list ap;
+
+ va_start(ap, fmt);
+ logmsg = format_log_message_ap(level, sublevel, file, line, function, callid, fmt, ap);
+ va_end(ap);
+
+ return logmsg;
}
/*! \brief Actual logging thread */
AST_LIST_LOCK(&logmsgs);
if (AST_LIST_EMPTY(&logmsgs)) {
if (close_logger_thread) {
+ AST_LIST_UNLOCK(&logmsgs);
break;
} else {
ast_cond_wait(&logcond, &logmsgs.lock);
}
}
+
+ if (high_water_alert) {
+ msg = format_log_message(__LOG_WARNING, 0, "logger", 0, "***", 0,
+ "Logging resumed. %d message%s discarded.\n",
+ logger_messages_discarded, logger_messages_discarded == 1 ? "" : "s");
+ if (msg) {
+ AST_LIST_INSERT_TAIL(&logmsgs, msg, list);
+ }
+ high_water_alert = 0;
+ logger_messages_discarded = 0;
+ }
+
next = AST_LIST_FIRST(&logmsgs);
AST_LIST_HEAD_INIT_NOLOCK(&logmsgs);
+ logger_queue_size = 0;
AST_LIST_UNLOCK(&logmsgs);
/* Otherwise go through and process each message in the order added */
next = AST_LIST_NEXT(msg, list);
/* Depending on the type, send it to the proper function */
- if (msg->type == LOGMSG_NORMAL)
- logger_print_normal(msg);
- else if (msg->type == LOGMSG_VERBOSE)
- logger_print_verbose(msg);
+ logger_print_normal(msg);
/* Free the data since we are done */
- ast_free(msg);
+ logmsg_free(msg);
}
-
- /* If we should stop, then stop */
- if (close_logger_thread)
- break;
}
return NULL;
}
-int init_logger(void)
+/*!
+ * \internal
+ * \brief Initialize the logger queue.
+ *
+ * \note Assumes logchannels is write locked on entry.
+ *
+ * \return Nothing
+ */
+static void logger_queue_init(void)
{
- char tmp[256];
- int res = 0;
+ ast_unload_realtime("queue_log");
+ if (logfiles.queue_log) {
+ char qfname[PATH_MAX];
+
+ if (logger_queue_rt_start()) {
+ return;
+ }
+
+ /* Open the log file. */
+ snprintf(qfname, sizeof(qfname), "%s/%s", ast_config_AST_LOG_DIR,
+ queue_log_name);
+ if (qlog) {
+ /* Just in case it was already open. */
+ fclose(qlog);
+ }
+ qlog = fopen(qfname, "a");
+ if (!qlog) {
+ ast_log(LOG_ERROR, "Unable to create queue log: %s\n", strerror(errno));
+ }
+ }
+}
+
+int ast_is_logger_initialized(void)
+{
+ return logger_initialized;
+}
+
+/*!
+ * \brief Start the ast_queue_log() logger.
+ *
+ * \note Called when the system is fully booted after startup
+ * so preloaded realtime modules can get up.
+ *
+ * \return Nothing
+ */
+void logger_queue_start(void)
+{
+ /* Must not be called before the logger is initialized. */
+ ast_assert(logger_initialized);
+ AST_RWLIST_WRLOCK(&logchannels);
+ if (!queuelog_init) {
+ logger_queue_init();
+ queuelog_init = 1;
+ AST_RWLIST_UNLOCK(&logchannels);
+ ast_queue_log("NONE", "NONE", "NONE", "QUEUESTART", "%s", "");
+ } else {
+ AST_RWLIST_UNLOCK(&logchannels);
+ }
+}
+
+int init_logger(void)
+{
+ int res;
/* auto rotate if sig SIGXFSZ comes a-knockin */
sigaction(SIGXFSZ, &handle_SIGXFSZ, NULL);
- /* start logger thread */
+ /* Re-initialize the logmsgs mutex. The recursive mutex can be accessed prior
+ * to Asterisk being forked into the background, which can cause the thread
+ * ID tracked by the underlying pthread mutex to be different than the ID of
+ * the thread that unlocks the mutex. Since init_logger is called after the
+ * fork, it is safe to initialize the mutex here for future accesses.
+ */
+ ast_mutex_destroy(&logmsgs.lock);
+ ast_mutex_init(&logmsgs.lock);
ast_cond_init(&logcond, NULL);
+
+ /* start logger thread */
if (ast_pthread_create(&logthread, NULL, logger_thread, NULL) < 0) {
ast_cond_destroy(&logcond);
return -1;
ast_cli_register_multiple(cli_logger, ARRAY_LEN(cli_logger));
ast_mkdir(ast_config_AST_LOG_DIR, 0777);
-
- /* create log channels */
- init_logger_chain(0 /* locked */);
- if (logfiles.queue_log) {
- snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
- qlog = fopen(tmp, "a");
- ast_queue_log("NONE", "NONE", "NONE", "QUEUESTART", "%s", "");
+ /* create log channels */
+ AST_RWLIST_WRLOCK(&logchannels);
+ res = init_logger_chain(NULL);
+ AST_RWLIST_UNLOCK(&logchannels);
+ ast_verb_update();
+ logger_initialized = 1;
+ if (res) {
+ ast_log(LOG_ERROR, "Errors detected in logger.conf. Default console logging is being used.\n");
}
- return res;
+
+ return 0;
}
void close_logger(void)
{
struct logchannel *f = NULL;
+ ast_cli_unregister_multiple(cli_logger, ARRAY_LEN(cli_logger));
+
+ logger_initialized = 0;
+
/* Stop logger thread */
AST_LIST_LOCK(&logmsgs);
close_logger_thread = 1;
ast_cond_signal(&logcond);
AST_LIST_UNLOCK(&logmsgs);
- if (logthread != AST_PTHREADT_NULL)
+ if (logthread != AST_PTHREADT_NULL) {
pthread_join(logthread, NULL);
+ }
AST_RWLIST_WRLOCK(&logchannels);
qlog = NULL;
}
- AST_RWLIST_TRAVERSE(&logchannels, f, list) {
+ while ((f = AST_LIST_REMOVE_HEAD(&logchannels, list))) {
if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) {
fclose(f->fileptr);
f->fileptr = NULL;
}
+ ast_free(f);
}
closelog(); /* syslog */
AST_RWLIST_UNLOCK(&logchannels);
+}
- return;
+void ast_callid_strnprint(char *buffer, size_t buffer_size, ast_callid callid)
+{
+ snprintf(buffer, buffer_size, "[C-%08x]", callid);
+}
+
+ast_callid ast_create_callid(void)
+{
+ return ast_atomic_fetchadd_int(&next_unique_callid, +1);
+}
+
+ast_callid ast_read_threadstorage_callid(void)
+{
+ ast_callid *callid;
+
+ callid = ast_threadstorage_get(&unique_callid, sizeof(*callid));
+
+ return callid ? *callid : 0;
+}
+
+int ast_callid_threadassoc_change(ast_callid callid)
+{
+ ast_callid *id = ast_threadstorage_get(&unique_callid, sizeof(*id));
+
+ if (!id) {
+ return -1;
+ }
+
+ *id = callid;
+
+ return 0;
+}
+
+int ast_callid_threadassoc_add(ast_callid callid)
+{
+ ast_callid *pointing;
+
+ pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing));
+ if (!pointing) {
+ return -1;
+ }
+
+ if (*pointing) {
+ ast_log(LOG_ERROR, "ast_callid_threadassoc_add(C-%08x) on thread "
+ "already associated with callid [C-%08x].\n", callid, *pointing);
+ return 1;
+ }
+
+ *pointing = callid;
+ return 0;
+}
+
+int ast_callid_threadassoc_remove(void)
+{
+ ast_callid *pointing;
+
+ pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing));
+ if (!pointing) {
+ return -1;
+ }
+
+ if (*pointing) {
+ *pointing = 0;
+ return 0;
+ }
+
+ return -1;
+}
+
+int ast_callid_threadstorage_auto(ast_callid *callid)
+{
+ ast_callid tmp;
+
+ /* Start by trying to see if a callid is available from thread storage */
+ tmp = ast_read_threadstorage_callid();
+ if (tmp) {
+ *callid = tmp;
+ return 0;
+ }
+
+ /* If that failed, try to create a new one and bind it. */
+ *callid = ast_create_callid();
+ if (*callid) {
+ ast_callid_threadassoc_add(*callid);
+ return 1;
+ }
+
+ /* If neither worked, then something must have gone wrong. */
+ return -1;
+}
+
+void ast_callid_threadstorage_auto_clean(ast_callid callid, int callid_created)
+{
+ if (callid && callid_created) {
+ /* If the callid was created rather than simply grabbed from the thread storage, we need to unbind here. */
+ ast_callid_threadassoc_remove();
+ }
}
/*!
* \brief send log messages to syslog and/or the console
*/
-void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
+static void __attribute__((format(printf, 7, 0))) ast_log_full(int level, int sublevel,
+ const char *file, int line, const char *function, ast_callid callid,
+ const char *fmt, va_list ap)
{
struct logmsg *logmsg = NULL;
- struct ast_str *buf = NULL;
- struct ast_tm tm;
- struct timeval now = ast_tvnow();
- int res = 0;
- va_list ap;
- char datestring[256];
- if (!(buf = ast_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE)))
+ if (level == __LOG_VERBOSE && ast_opt_remote && ast_opt_exec) {
return;
+ }
- if (AST_RWLIST_EMPTY(&logchannels)) {
- /*
- * we don't have the logger chain configured yet,
- * so just log to stdout
- */
- if (level != __LOG_VERBOSE) {
- int result;
- va_start(ap, fmt);
- result = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
- va_end(ap);
- if (result != AST_DYNSTR_BUILD_FAILED) {
- term_filter_escapes(ast_str_buffer(buf));
- fputs(ast_str_buffer(buf), stdout);
- }
+ AST_LIST_LOCK(&logmsgs);
+ if (logger_queue_size >= logger_queue_limit && !close_logger_thread) {
+ logger_messages_discarded++;
+ if (!high_water_alert && !close_logger_thread) {
+ logmsg = format_log_message(__LOG_WARNING, 0, "logger", 0, "***", 0,
+ "Log queue threshold (%d) exceeded. Discarding new messages.\n", logger_queue_limit);
+ AST_LIST_INSERT_TAIL(&logmsgs, logmsg, list);
+ high_water_alert = 1;
+ ast_cond_signal(&logcond);
}
+ AST_LIST_UNLOCK(&logmsgs);
return;
}
-
- /* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug
- are non-zero; LOG_DEBUG messages can still be displayed if option_debug
- is zero, if option_verbose is non-zero (this allows for 'level zero'
- LOG_DEBUG messages to be displayed, if the logmask on any channel
- allows it)
- */
- if (!option_verbose && !option_debug && (level == __LOG_DEBUG))
- return;
-
- /* Ignore anything that never gets logged anywhere */
- if (!(global_logmask & (1 << level)))
- return;
-
- /* Build string */
- va_start(ap, fmt);
- res = ast_str_set_va(&buf, BUFSIZ, fmt, ap);
- va_end(ap);
-
- /* If the build failed, then abort and free this structure */
- if (res == AST_DYNSTR_BUILD_FAILED)
- return;
+ AST_LIST_UNLOCK(&logmsgs);
- /* Create a new logging message */
- if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128)))
+ logmsg = format_log_message_ap(level, sublevel, file, line, function, callid, fmt, ap);
+ if (!logmsg) {
return;
-
- /* Copy string over */
- ast_string_field_set(logmsg, message, ast_str_buffer(buf));
-
- /* Set type to be normal */
- logmsg->type = LOGMSG_NORMAL;
-
- /* Create our date/time */
- ast_localtime(&now, &tm, NULL);
- ast_strftime(datestring, sizeof(datestring), dateformat, &tm);
- ast_string_field_set(logmsg, date, datestring);
-
- /* Copy over data */
- logmsg->level = level;
- logmsg->line = line;
- ast_string_field_set(logmsg, level_name, levels[level]);
- ast_string_field_set(logmsg, file, file);
- ast_string_field_set(logmsg, function, function);
- logmsg->process_id = (long) GETTID();
+ }
/* If the logger thread is active, append it to the tail end of the list - otherwise skip that step */
if (logthread != AST_PTHREADT_NULL) {
AST_LIST_LOCK(&logmsgs);
- AST_LIST_INSERT_TAIL(&logmsgs, logmsg, list);
- ast_cond_signal(&logcond);
+ if (close_logger_thread) {
+ /* Logger is either closing or closed. We cannot log this message. */
+ logmsg_free(logmsg);
+ } else {
+ AST_LIST_INSERT_TAIL(&logmsgs, logmsg, list);
+ logger_queue_size++;
+ ast_cond_signal(&logcond);
+ }
AST_LIST_UNLOCK(&logmsgs);
} else {
logger_print_normal(logmsg);
- ast_free(logmsg);
+ logmsg_free(logmsg);
}
-
- return;
}
-#ifdef HAVE_BKTR
-
-struct ast_bt *ast_bt_create(void)
+void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
{
- struct ast_bt *bt = ast_calloc(1, sizeof(*bt));
- if (!bt) {
- ast_log(LOG_ERROR, "Unable to allocate memory for backtrace structure!\n");
- return NULL;
- }
-
- bt->alloced = 1;
+ ast_callid callid;
+ va_list ap;
- ast_bt_get_addresses(bt);
+ callid = ast_read_threadstorage_callid();
- return bt;
+ va_start(ap, fmt);
+ if (level == __LOG_VERBOSE) {
+ __ast_verbose_ap(file, line, function, 0, callid, fmt, ap);
+ } else {
+ ast_log_full(level, -1, file, line, function, callid, fmt, ap);
+ }
+ va_end(ap);
}
-int ast_bt_get_addresses(struct ast_bt *bt)
+void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...)
{
- bt->num_frames = backtrace(bt->addresses, AST_MAX_BT_FRAMES);
+ va_list ap;
+ void *recursed = ast_threadstorage_get_ptr(&in_safe_log);
+ ast_callid callid;
- return 0;
-}
+ if (recursed) {
+ return;
+ }
-void *ast_bt_destroy(struct ast_bt *bt)
-{
- if (bt->alloced) {
- ast_free(bt);
+ if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) {
+ /* We've failed to set the flag that protects against
+ * recursion, so bail. */
+ return;
}
- return NULL;
+ callid = ast_read_threadstorage_callid();
+
+ va_start(ap, fmt);
+ ast_log_full(level, -1, file, line, function, callid, fmt, ap);
+ va_end(ap);
+
+ /* Clear flag so the next allocation failure can be logged. */
+ ast_threadstorage_set_ptr(&in_safe_log, NULL);
+}
+
+void ast_log_callid(int level, const char *file, int line, const char *function, ast_callid callid, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ ast_log_full(level, -1, file, line, function, callid, fmt, ap);
+ va_end(ap);
}
-#endif /* HAVE_BKTR */
-void ast_backtrace(void)
+void ast_log_backtrace(void)
{
#ifdef HAVE_BKTR
struct ast_bt *bt;
return;
}
- if ((strings = backtrace_symbols(bt->addresses, bt->num_frames))) {
- ast_debug(1, "Got %d backtrace record%c\n", bt->num_frames, bt->num_frames != 1 ? 's' : ' ');
+ if ((strings = ast_bt_get_symbols(bt->addresses, bt->num_frames))) {
+ ast_verbose("Got %d backtrace record%c\n", bt->num_frames, bt->num_frames != 1 ? 's' : ' ');
for (i = 3; i < bt->num_frames - 2; i++) {
- ast_log(LOG_DEBUG, "#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]);
+ ast_verbose("#%d: [%p] %s\n", i - 3, bt->addresses[i], strings[i]);
}
- /* MALLOC_DEBUG will erroneously report an error here, unless we undef the macro. */
-#undef free
- free(strings);
+ ast_std_free(strings);
} else {
- ast_debug(1, "Could not allocate memory for backtrace\n");
+ ast_verbose("Could not allocate memory for backtrace\n");
}
ast_bt_destroy(bt);
#else
ast_log(LOG_WARNING, "Must run configure with '--with-execinfo' for stack backtraces.\n");
-#endif
+#endif /* defined(HAVE_BKTR) */
}
-void __ast_verbose_ap(const char *file, int line, const char *func, const char *fmt, va_list ap)
+void __ast_verbose_ap(const char *file, int line, const char *func, int level, ast_callid callid, const char *fmt, va_list ap)
{
- struct logmsg *logmsg = NULL;
- struct ast_str *buf = NULL;
- int res = 0;
+ ast_log_full(__LOG_VERBOSE, level, file, line, func, callid, fmt, ap);
+}
- if (!(buf = ast_str_thread_get(&verbose_buf, VERBOSE_BUF_INIT_SIZE)))
- return;
+void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)
+{
+ ast_callid callid;
+ va_list ap;
- if (ast_opt_timestamp) {
- struct timeval now;
- struct ast_tm tm;
- char date[40];
- char *datefmt;
-
- now = ast_tvnow();
- ast_localtime(&now, &tm, NULL);
- ast_strftime(date, sizeof(date), dateformat, &tm);
- datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1);
- sprintf(datefmt, "%c[%s] %s", 127, date, fmt);
- fmt = datefmt;
- } else {
- char *tmp = alloca(strlen(fmt) + 2);
- sprintf(tmp, "%c%s", 127, fmt);
- fmt = tmp;
- }
+ callid = ast_read_threadstorage_callid();
- /* Build string */
- res = ast_str_set_va(&buf, 0, fmt, ap);
+ va_start(ap, fmt);
+ __ast_verbose_ap(file, line, func, level, callid, fmt, ap);
+ va_end(ap);
+}
- /* If the build failed then we can drop this allocated message */
- if (res == AST_DYNSTR_BUILD_FAILED)
- return;
+void __ast_verbose_callid(const char *file, int line, const char *func, int level, ast_callid callid, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ __ast_verbose_ap(file, line, func, level, callid, fmt, ap);
+ va_end(ap);
+}
- if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128)))
- return;
+/*! Console verbosity level node. */
+struct verb_console {
+ /*! List node link */
+ AST_LIST_ENTRY(verb_console) node;
+ /*! Console verbosity level. */
+ int *level;
+};
- ast_string_field_set(logmsg, message, ast_str_buffer(buf));
+/*! Registered console verbosity levels */
+static AST_RWLIST_HEAD_STATIC(verb_consoles, verb_console);
- ast_log(__LOG_VERBOSE, file, line, func, "%s", logmsg->message + 1);
+/*! ast_verb_update() reentrancy protection lock. */
+AST_MUTEX_DEFINE_STATIC(verb_update_lock);
- /* Set type */
- logmsg->type = LOGMSG_VERBOSE;
-
- /* Add to the list and poke the thread if possible */
- if (logthread != AST_PTHREADT_NULL) {
- AST_LIST_LOCK(&logmsgs);
- AST_LIST_INSERT_TAIL(&logmsgs, logmsg, list);
- ast_cond_signal(&logcond);
- AST_LIST_UNLOCK(&logmsgs);
- } else {
- logger_print_verbose(logmsg);
- ast_free(logmsg);
+void ast_verb_update(void)
+{
+ struct logchannel *log;
+ struct verb_console *console;
+ int verb_level;
+
+ ast_mutex_lock(&verb_update_lock);
+
+ AST_RWLIST_RDLOCK(&verb_consoles);
+
+ /* Default to the root console verbosity. */
+ verb_level = option_verbose;
+
+ /* Determine max remote console level. */
+ AST_LIST_TRAVERSE(&verb_consoles, console, node) {
+ if (verb_level < *console->level) {
+ verb_level = *console->level;
+ }
}
+ AST_RWLIST_UNLOCK(&verb_consoles);
+
+ /* Determine max logger channel level. */
+ AST_RWLIST_RDLOCK(&logchannels);
+ AST_RWLIST_TRAVERSE(&logchannels, log, list) {
+ if (verb_level < log->verbosity) {
+ verb_level = log->verbosity;
+ }
+ }
+ AST_RWLIST_UNLOCK(&logchannels);
+
+ ast_verb_sys_level = verb_level;
+
+ ast_mutex_unlock(&verb_update_lock);
}
-void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...)
+/*!
+ * \internal
+ * \brief Unregister a console verbose level.
+ *
+ * \param console Which console to unregister.
+ *
+ * \return Nothing
+ */
+static void verb_console_unregister(struct verb_console *console)
{
- va_list ap;
-
- va_start(ap, fmt);
- __ast_verbose_ap(file, line, func, fmt, ap);
- va_end(ap);
+ AST_RWLIST_WRLOCK(&verb_consoles);
+ console = AST_RWLIST_REMOVE(&verb_consoles, console, node);
+ AST_RWLIST_UNLOCK(&verb_consoles);
+ if (console) {
+ ast_verb_update();
+ }
}
-/* No new code should use this directly, but we have the ABI for backwards compat */
-#undef ast_verbose
-void __attribute__((format(printf, 1,2))) ast_verbose(const char *fmt, ...);
-void ast_verbose(const char *fmt, ...)
+static void verb_console_free(void *v_console)
{
- va_list ap;
+ struct verb_console *console = v_console;
- va_start(ap, fmt);
- __ast_verbose_ap("", 0, "", fmt, ap);
- va_end(ap);
+ verb_console_unregister(console);
+ ast_free(console);
}
-int ast_register_verbose(void (*v)(const char *string))
+/*! Thread specific console verbosity level node. */
+AST_THREADSTORAGE_CUSTOM(my_verb_console, NULL, verb_console_free);
+
+void ast_verb_console_register(int *level)
{
- struct verb *verb;
+ struct verb_console *console;
- if (!(verb = ast_malloc(sizeof(*verb))))
- return -1;
+ console = ast_threadstorage_get(&my_verb_console, sizeof(*console));
+ if (!console || !level) {
+ return;
+ }
+ console->level = level;
- verb->verboser = v;
+ AST_RWLIST_WRLOCK(&verb_consoles);
+ AST_RWLIST_INSERT_HEAD(&verb_consoles, console, node);
+ AST_RWLIST_UNLOCK(&verb_consoles);
+ ast_verb_update();
+}
- AST_RWLIST_WRLOCK(&verbosers);
- AST_RWLIST_INSERT_HEAD(&verbosers, verb, list);
- AST_RWLIST_UNLOCK(&verbosers);
-
- return 0;
+void ast_verb_console_unregister(void)
+{
+ struct verb_console *console;
+
+ console = ast_threadstorage_get(&my_verb_console, sizeof(*console));
+ if (!console) {
+ return;
+ }
+ verb_console_unregister(console);
}
-int ast_unregister_verbose(void (*v)(const char *string))
+int ast_verb_console_get(void)
{
- struct verb *cur;
+ struct verb_console *console;
+ int verb_level;
+
+ console = ast_threadstorage_get(&my_verb_console, sizeof(*console));
+ AST_RWLIST_RDLOCK(&verb_consoles);
+ if (!console) {
+ verb_level = 0;
+ } else if (console->level) {
+ verb_level = *console->level;
+ } else {
+ verb_level = option_verbose;
+ }
+ AST_RWLIST_UNLOCK(&verb_consoles);
+ return verb_level;
+}
- AST_RWLIST_WRLOCK(&verbosers);
- AST_RWLIST_TRAVERSE_SAFE_BEGIN(&verbosers, cur, list) {
- if (cur->verboser == v) {
- AST_RWLIST_REMOVE_CURRENT(list);
- ast_free(cur);
- break;
- }
+void ast_verb_console_set(int verb_level)
+{
+ struct verb_console *console;
+
+ console = ast_threadstorage_get(&my_verb_console, sizeof(*console));
+ if (!console) {
+ return;
}
- AST_RWLIST_TRAVERSE_SAFE_END;
- AST_RWLIST_UNLOCK(&verbosers);
-
- return cur ? 0 : -1;
+
+ AST_RWLIST_WRLOCK(&verb_consoles);
+ if (console->level) {
+ *console->level = verb_level;
+ } else {
+ option_verbose = verb_level;
+ }
+ AST_RWLIST_UNLOCK(&verb_consoles);
+ ast_verb_update();
}
static void update_logchannels(void)
global_logmask = 0;
AST_RWLIST_TRAVERSE(&logchannels, cur, list) {
- cur->logmask = make_components(cur->components, cur->lineno);
+ make_components(cur);
global_logmask |= cur->logmask;
}
AST_RWLIST_UNLOCK(&logchannels);
- ast_debug(1, "Registered dynamic logger level '%s' with index %d.\n", name, available);
+ ast_debug(1, "Registered dynamic logger level '%s' with index %u.\n", name, available);
update_logchannels();
global_logmask &= ~(1 << x);
- free(levels[x]);
+ ast_free(levels[x]);
levels[x] = NULL;
AST_RWLIST_UNLOCK(&logchannels);
- ast_debug(1, "Unregistered dynamic logger level '%s' with index %d.\n", name, x);
+ ast_debug(1, "Unregistered dynamic logger level '%s' with index %u.\n", name, x);
update_logchannels();
} else {
}
}
+const char *ast_logger_get_dateformat(void)
+{
+ return dateformat;
+}
+
+void ast_logger_set_queue_limit(int queue_limit)
+{
+ logger_queue_limit = queue_limit;
+}
+
+int ast_logger_get_queue_limit(void)
+{
+ return logger_queue_limit;
+}
projects / asterisk/asterisk.git / blobdiff