Merge the rest of the FullyBooted patch
[asterisk/asterisk.git] / main / logger.c
index c64b634..698e782 100644 (file)
@@ -19,7 +19,7 @@
 /*! \file
  *
  * \brief Asterisk Logger
- * 
+ *
  * Logging routines
  *
  * \author Mark Spencer <markster@digium.com>
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/stat.h>
-#if ((defined(AST_DEVMODE)) && (defined(Linux)))
-#include <execinfo.h>
-#define MAX_BACKTRACE_FRAMES 20
-#endif
-
-#define SYSLOG_NAMES /* so we can map syslog facilities names to their numeric values,
-                       from <syslog.h> which is included by logger.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>
 
-static int syslog_level_map[] = {
-       LOG_DEBUG,
-       LOG_INFO,    /* arbitrary equivalent of LOG_EVENT */
-       LOG_NOTICE,
-       LOG_WARNING,
-       LOG_ERR,
-       LOG_DEBUG,
-       LOG_DEBUG
-};
-
-#define SYSLOG_NLEVELS sizeof(syslog_level_map) / sizeof(int)
-
+#include "asterisk/_private.h"
+#include "asterisk/paths.h"    /* use ast_config_AST_LOG_DIR */
 #include "asterisk/logger.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
 #include "asterisk/term.h"
@@ -70,6 +45,18 @@ static int syslog_level_map[] = {
 #include "asterisk/manager.h"
 #include "asterisk/threadstorage.h"
 #include "asterisk/strings.h"
+#include "asterisk/pbx.h"
+#include "asterisk/app.h"
+#include "asterisk/syslog.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>
@@ -80,20 +67,23 @@ static int syslog_level_map[] = {
 #else
 #define GETTID() getpid()
 #endif
-
-
 static char dateformat[256] = "%b %e %T";              /* Original Asterisk Format */
 
 static char queue_log_name[256] = QUEUELOG;
+static char exec_after_rotate[256] = "";
 
 static int filesize_reload_needed;
-static int global_logmask = -1;
-static int rotatetimestamp;
+static unsigned int global_logmask = 0xFFFF;
+
+static enum rotatestrategy {
+       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 */
+} rotatestrategy = SEQUENTIAL;
 
 static struct {
        unsigned int queue_log:1;
-       unsigned int event_log:1;
-} logfiles = { 1, 1 };
+} logfiles = { 1 };
 
 static char hostname[MAXHOSTNAMELEN];
 
@@ -104,16 +94,27 @@ enum logtypes {
 };
 
 struct logchannel {
-       int logmask;                    /* What to log to this channel */
-       int disabled;                   /* If this channel is disabled or not */
-       int facility;                   /* syslog facility */
-       enum logtypes type;             /* Type of log channel */
-       FILE *fileptr;                  /* logfile logging file pointer */
-       char filename[256];             /* Filename */
+       /*! What to log to this channel */
+       unsigned int logmask;
+       /*! If this channel is disabled or not */
+       int disabled;
+       /*! syslog facility */
+       int facility;
+       /*! Type of log channel */
+       enum logtypes type;
+       /*! logfile logging file pointer */
+       FILE *fileptr;
+       /*! Filename */
+       char filename[PATH_MAX];
+       /*! field for linking to list */
        AST_LIST_ENTRY(logchannel) list;
+       /*! Line number from configuration file */
+       int lineno;
+       /*! Components (levels) from last config load */
+       char components[0];
 };
 
-static AST_LIST_HEAD_STATIC(logchannels, logchannel);
+static AST_RWLIST_HEAD_STATIC(logchannels, logchannel);
 
 enum logmsgtypes {
        LOGMSG_NORMAL = 0,
@@ -122,41 +123,81 @@ enum logmsgtypes {
 
 struct logmsg {
        enum logmsgtypes type;
-       char date[256];
        int level;
-       const char *file;
        int line;
-       const char *function;
+       long process_id;
+       AST_DECLARE_STRING_FIELDS(
+               AST_STRING_FIELD(date);
+               AST_STRING_FIELD(file);
+               AST_STRING_FIELD(function);
+               AST_STRING_FIELD(message);
+               AST_STRING_FIELD(level_name);
+       );
        AST_LIST_ENTRY(logmsg) list;
-       char str[0];
 };
 
 static AST_LIST_HEAD_STATIC(logmsgs, logmsg);
 static pthread_t logthread = AST_PTHREADT_NULL;
 static ast_cond_t logcond;
-static int close_logger_thread;
+static int close_logger_thread = 0;
 
-static FILE *eventlog;
 static FILE *qlog;
 
-static char *levels[] = {
+/*! \brief Logging channels used in the Asterisk logging system
+ *
+ * The first 16 levels are reserved for system usage, and the remaining
+ * levels are reserved for usage by dynamic levels registered via
+ * ast_logger_register_level.
+ */
+
+/* Modifications to this array are protected by the rwlock in the
+ * logchannels list.
+ */
+
+static char *levels[32] = {
        "DEBUG",
-       "EVENT",
+       "---EVENT---",          /* no longer used */
        "NOTICE",
        "WARNING",
        "ERROR",
        "VERBOSE",
-       "DTMF"
+       "DTMF",
 };
 
-static int colors[] = {
+/*! \brief Colors used in the console for logging */
+static const int colors[32] = {
        COLOR_BRGREEN,
-       COLOR_BRBLUE,
+       COLOR_BRBLUE,           /* no longer used */
        COLOR_YELLOW,
        COLOR_BRRED,
        COLOR_RED,
        COLOR_GREEN,
-       COLOR_BRGREEN
+       COLOR_BRGREEN,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
+       COLOR_BRBLUE,
 };
 
 AST_THREADSTORAGE(verbose_buf);
@@ -165,47 +206,41 @@ AST_THREADSTORAGE(verbose_buf);
 AST_THREADSTORAGE(log_buf);
 #define LOG_BUF_INIT_SIZE       256
 
-static int make_components(char *s, int lineno)
+static unsigned int make_components(const char *s, int lineno)
 {
        char *w;
-       int res = 0;
-       char *stringp = s;
+       unsigned int res = 0;
+       char *stringp = ast_strdupa(s);
+       unsigned int x;
 
        while ((w = strsep(&stringp, ","))) {
                w = ast_skip_blanks(w);
-               if (!strcasecmp(w, "error")) 
-                       res |= (1 << __LOG_ERROR);
-               else if (!strcasecmp(w, "warning"))
-                       res |= (1 << __LOG_WARNING);
-               else if (!strcasecmp(w, "notice"))
-                       res |= (1 << __LOG_NOTICE);
-               else if (!strcasecmp(w, "event"))
-                       res |= (1 << __LOG_EVENT);
-               else if (!strcasecmp(w, "debug"))
-                       res |= (1 << __LOG_DEBUG);
-               else if (!strcasecmp(w, "verbose"))
-                       res |= (1 << __LOG_VERBOSE);
-               else if (!strcasecmp(w, "dtmf"))
-                       res |= (1 << __LOG_DTMF);
-               else {
-                       fprintf(stderr, "Logfile Warning: Unknown keyword '%s' at line %d of logger.conf\n", w, lineno);
+
+               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;
+                       }
                }
        }
 
        return res;
 }
 
-static struct logchannel *make_logchannel(char *channel, char *components, int lineno)
+static struct logchannel *make_logchannel(const char *channel, const char *components, int lineno)
 {
        struct logchannel *chan;
        char *facility;
-#ifndef SOLARIS
-       CODE *cptr;
-#endif
 
-       if (ast_strlen_zero(channel) || !(chan = ast_calloc(1, sizeof(*chan))))
+       if (ast_strlen_zero(channel) || !(chan = ast_calloc(1, sizeof(*chan) + strlen(components) + 1)))
                return NULL;
 
+       strcpy(chan->components, components);
+       chan->lineno = lineno;
+
        if (!strcasecmp(channel, "console")) {
                chan->type = LOGTYPE_CONSOLE;
        } else if (!strncasecmp(channel, "syslog", 6)) {
@@ -218,114 +253,60 @@ static struct logchannel *make_logchannel(char *channel, char *components, int l
                        facility = "local0";
                }
 
-#ifndef SOLARIS
-               /*
-               * Walk through the list of facilitynames (defined in sys/syslog.h)
-               * to see if we can find the one we have been given
-               */
-               chan->facility = -1;
-               cptr = facilitynames;
-               while (cptr->c_name) {
-                       if (!strcasecmp(facility, cptr->c_name)) {
-                               chan->facility = cptr->c_val;
-                               break;
-                       }
-                       cptr++;
-               }
-#else
-               chan->facility = -1;
-               if (!strcasecmp(facility, "kern")) 
-                       chan->facility = LOG_KERN;
-               else if (!strcasecmp(facility, "USER")) 
-                       chan->facility = LOG_USER;
-               else if (!strcasecmp(facility, "MAIL")) 
-                       chan->facility = LOG_MAIL;
-               else if (!strcasecmp(facility, "DAEMON")) 
-                       chan->facility = LOG_DAEMON;
-               else if (!strcasecmp(facility, "AUTH")) 
-                       chan->facility = LOG_AUTH;
-               else if (!strcasecmp(facility, "SYSLOG")) 
-                       chan->facility = LOG_SYSLOG;
-               else if (!strcasecmp(facility, "LPR")) 
-                       chan->facility = LOG_LPR;
-               else if (!strcasecmp(facility, "NEWS")) 
-                       chan->facility = LOG_NEWS;
-               else if (!strcasecmp(facility, "UUCP")) 
-                       chan->facility = LOG_UUCP;
-               else if (!strcasecmp(facility, "CRON")) 
-                       chan->facility = LOG_CRON;
-               else if (!strcasecmp(facility, "LOCAL0")) 
-                       chan->facility = LOG_LOCAL0;
-               else if (!strcasecmp(facility, "LOCAL1")) 
-                       chan->facility = LOG_LOCAL1;
-               else if (!strcasecmp(facility, "LOCAL2")) 
-                       chan->facility = LOG_LOCAL2;
-               else if (!strcasecmp(facility, "LOCAL3")) 
-                       chan->facility = LOG_LOCAL3;
-               else if (!strcasecmp(facility, "LOCAL4")) 
-                       chan->facility = LOG_LOCAL4;
-               else if (!strcasecmp(facility, "LOCAL5")) 
-                       chan->facility = LOG_LOCAL5;
-               else if (!strcasecmp(facility, "LOCAL6")) 
-                       chan->facility = LOG_LOCAL6;
-               else if (!strcasecmp(facility, "LOCAL7")) 
-                       chan->facility = LOG_LOCAL7;
-#endif /* Solaris */
-
-               if (0 > chan->facility) {
+               chan->facility = ast_syslog_facility(facility);
+
+               if (chan->facility < 0) {
                        fprintf(stderr, "Logger Warning: bad syslog facility in logger.conf\n");
-                       free(chan);
+                       ast_free(chan);
                        return NULL;
                }
 
                chan->type = LOGTYPE_SYSLOG;
-               snprintf(chan->filename, sizeof(chan->filename), "%s", channel);
+               ast_copy_string(chan->filename, channel, sizeof(chan->filename));
                openlog("asterisk", LOG_PID, chan->facility);
        } else {
-               if (channel[0] == '/') {
-                       if (!ast_strlen_zero(hostname)) { 
-                               snprintf(chan->filename, sizeof(chan->filename) - 1,"%s.%s", channel, hostname);
-                       } else {
-                               ast_copy_string(chan->filename, channel, sizeof(chan->filename));
-                       }
-               }                 
-               
                if (!ast_strlen_zero(hostname)) {
-                       snprintf(chan->filename, sizeof(chan->filename), "%s/%s.%s", ast_config_AST_LOG_DIR, channel, hostname);
+                       snprintf(chan->filename, sizeof(chan->filename), "%s/%s.%s",
+                                channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel, hostname);
                } else {
-                       snprintf(chan->filename, sizeof(chan->filename), "%s/%s", ast_config_AST_LOG_DIR, channel);
+                       snprintf(chan->filename, sizeof(chan->filename), "%s/%s",
+                                channel[0] != '/' ? ast_config_AST_LOG_DIR : "", channel);
                }
-               chan->fileptr = fopen(chan->filename, "a");
-               if (!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(components, lineno);
+       chan->logmask = make_components(chan->components, lineno);
+
        return chan;
 }
 
-static void init_logger_chain(void)
+static void init_logger_chain(int locked)
 {
        struct logchannel *chan;
        struct ast_config *cfg;
        struct ast_variable *var;
        const char *s;
+       struct ast_flags config_flags = { 0 };
+
+       if (!(cfg = ast_config_load2("logger.conf", "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID)
+               return;
 
        /* delete our list of log channels */
-       AST_LIST_LOCK(&logchannels);
-       while ((chan = AST_LIST_REMOVE_HEAD(&logchannels, list)))
-               free(chan);
-       AST_LIST_UNLOCK(&logchannels);
-       
+       if (!locked)
+               AST_RWLIST_WRLOCK(&logchannels);
+       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();
        
-       cfg = ast_config_load("logger.conf");
-       
        /* If no config file, we're fine, set default options. */
        if (!cfg) {
                if (errno)
@@ -335,11 +316,13 @@ static void init_logger_chain(void)
                if (!(chan = ast_calloc(1, sizeof(*chan))))
                        return;
                chan->type = LOGTYPE_CONSOLE;
-               chan->logmask = 28; /*warning,notice,error */
-               AST_LIST_LOCK(&logchannels);
-               AST_LIST_INSERT_HEAD(&logchannels, chan, list);
-               AST_LIST_UNLOCK(&logchannels);
+               chan->logmask = __LOG_WARNING | __LOG_NOTICE | __LOG_ERROR;
+               if (!locked)
+                       AST_RWLIST_WRLOCK(&logchannels);
+               AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
                global_logmask |= chan->logmask;
+               if (!locked)
+                       AST_RWLIST_UNLOCK(&logchannels);
                return;
        }
        
@@ -347,7 +330,7 @@ static void init_logger_chain(void)
                if (ast_true(s)) {
                        if (gethostname(hostname, sizeof(hostname) - 1)) {
                                ast_copy_string(hostname, "unknown", sizeof(hostname));
-                               ast_log(LOG_WARNING, "What box has no hostname???\n");
+                               fprintf(stderr, "What box has no hostname???\n");
                        }
                } else
                        hostname[0] = '\0';
@@ -359,67 +342,240 @@ static void init_logger_chain(void)
                ast_copy_string(dateformat, "%b %e %T", sizeof(dateformat));
        if ((s = ast_variable_retrieve(cfg, "general", "queue_log")))
                logfiles.queue_log = ast_true(s);
-       if ((s = ast_variable_retrieve(cfg, "general", "event_log")))
-               logfiles.event_log = 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", "rotatetimestamp")))
-               rotatetimestamp = 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)
+                       rotatestrategy = TIMESTAMP;
+               else if (strcasecmp(s, "rotate") == 0)
+                       rotatestrategy = ROTATE;
+               else if (strcasecmp(s, "sequential") == 0)
+                       rotatestrategy = SEQUENTIAL;
+               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");
+               }
+       }
 
-       AST_LIST_LOCK(&logchannels);
+       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)))
                        continue;
-               AST_LIST_INSERT_HEAD(&logchannels, chan, list);
+               AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
                global_logmask |= chan->logmask;
        }
-       AST_LIST_UNLOCK(&logchannels);
+       if (!locked)
+               AST_RWLIST_UNLOCK(&logchannels);
 
        ast_config_destroy(cfg);
 }
 
+void ast_child_verbose(int level, const char *fmt, ...)
+{
+       char *msg = NULL, *emsg = NULL, *sptr, *eptr;
+       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) {
+               va_end(ap);
+               va_end(aq);
+               return;
+       }
+       va_end(ap);
+
+       if (!(msg = ast_malloc(size + 1))) {
+               va_end(aq);
+               return;
+       }
+
+       vsnprintf(msg, size + 1, fmt, aq);
+       va_end(aq);
+
+       if (!(emsg = ast_malloc(size * 2 + 1))) {
+               ast_free(msg);
+               return;
+       }
+
+       for (sptr = msg, eptr = emsg; ; sptr++) {
+               if (*sptr == '"') {
+                       *eptr++ = '\\';
+               }
+               *eptr++ = *sptr;
+               if (*sptr == '\0') {
+                       break;
+               }
+       }
+       ast_free(msg);
+
+       fprintf(stdout, "verbose \"%s\" %d\n", emsg, level);
+       fflush(stdout);
+       ast_free(emsg);
+}
+
 void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
 {
        va_list ap;
-       AST_LIST_LOCK(&logchannels);
-       if (qlog) {
+       char qlog_msg[8192];
+       int qlog_len;
+       char time_str[16];
+
+       if (ast_check_realtime("queue_log")) {
                va_start(ap, fmt);
-               fprintf(qlog, "%ld|%s|%s|%s|%s|", (long)time(NULL), callid, queuename, agent, event);
-               vfprintf(qlog, fmt, ap);
-               fprintf(qlog, "\n");
+               vsnprintf(qlog_msg, sizeof(qlog_msg), fmt, ap);
                va_end(ap);
-               fflush(qlog);
+               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);
+               }
+               AST_RWLIST_RDLOCK(&logchannels);
+               if (qlog) {
+                       fprintf(qlog, "%s\n", qlog_msg);
+                       fflush(qlog);
+               }
+               AST_RWLIST_UNLOCK(&logchannels);
        }
-       AST_LIST_UNLOCK(&logchannels);
 }
 
-int reload_logger(int rotate)
+static int rotate_file(const char *filename)
 {
-       char old[PATH_MAX] = "";
+       char old[PATH_MAX];
        char new[PATH_MAX];
-       int event_rotate = rotate, queue_rotate = rotate;
-       struct logchannel *f;
-       FILE *myf;
-       int x, res = 0;
+       int x, y, which, found, res = 0, fd;
+       char *suffixes[4] = { "", ".gz", ".bz2", ".Z" };
+
+       switch (rotatestrategy) {
+       case SEQUENTIAL:
+               for (x = 0; ; x++) {
+                       snprintf(new, sizeof(new), "%s.%d", filename, x);
+                       fd = open(new, O_RDONLY);
+                       if (fd > -1)
+                               close(fd);
+                       else
+                               break;
+               }
+               if (rename(filename, new)) {
+                       fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
+                       res = -1;
+               }
+               break;
+       case TIMESTAMP:
+               snprintf(new, sizeof(new), "%s.%ld", filename, (long)time(NULL));
+               if (rename(filename, new)) {
+                       fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
+                       res = -1;
+               }
+               break;
+       case ROTATE:
+               /* Find the next empty slot, including a possible suffix */
+               for (x = 0; ; x++) {
+                       found = 0;
+                       for (which = 0; which < ARRAY_LEN(suffixes); which++) {
+                               snprintf(new, sizeof(new), "%s.%d%s", filename, x, suffixes[which]);
+                               fd = open(new, O_RDONLY);
+                               if (fd > -1) {
+                                       close(fd);
+                                       found = 1;
+                                       break;
+                               }
+                       }
+                       if (!found) {
+                               break;
+                       }
+               }
 
-       AST_LIST_LOCK(&logchannels);
+               /* Found an empty slot */
+               for (y = x; y > 0; y--) {
+                       for (which = 0; which < ARRAY_LEN(suffixes); which++) {
+                               snprintf(old, sizeof(old), "%s.%d%s", filename, y - 1, suffixes[which]);
+                               fd = open(old, O_RDONLY);
+                               if (fd > -1) {
+                                       /* Found the right suffix */
+                                       close(fd);
+                                       snprintf(new, sizeof(new), "%s.%d%s", filename, y, suffixes[which]);
+                                       if (rename(old, new)) {
+                                               fprintf(stderr, "Unable to rename file '%s' to '%s'\n", old, new);
+                                               res = -1;
+                                       }
+                                       break;
+                               }
+                       }
+               }
 
-       if (eventlog) 
-               fclose(eventlog);
-       else 
-               event_rotate = 0;
-       eventlog = NULL;
+               /* Finally, rename the current file */
+               snprintf(new, sizeof(new), "%s.0", filename);
+               if (rename(filename, new)) {
+                       fprintf(stderr, "Unable to rename file '%s' to '%s'\n", filename, new);
+                       res = -1;
+               }
+       }
 
-       if (qlog) 
-               fclose(qlog);
-       else 
+       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 (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)
+{
+       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 */
+                               fclose(qlog);
+                               qlog = NULL;
+                       } else
+                               queue_rotate = 0;
+               } else {
+                       fclose(qlog);
+                       qlog = NULL;
+               }
+       } else 
                queue_rotate = 0;
-       qlog = NULL;
 
-       mkdir(ast_config_AST_LOG_DIR, 0755);
+       ast_mkdir(ast_config_AST_LOG_DIR, 0777);
 
-       AST_LIST_TRAVERSE(&logchannels, f, list) {
+       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);
@@ -427,153 +583,163 @@ int reload_logger(int rotate)
                if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) {
                        fclose(f->fileptr);     /* Close file */
                        f->fileptr = NULL;
-                       if (rotate) {
-                               ast_copy_string(old, f->filename, sizeof(old));
-                               
-                               if (!rotatetimestamp) { 
-                                       for (x = 0; ; x++) {
-                                               snprintf(new, sizeof(new), "%s.%d", f->filename, x);
-                                               myf = fopen(new, "r");
-                                               if (myf)
-                                                       fclose(myf);
-                                               else
-                                                       break;
-                                       }
-                               } else 
-                                       snprintf(new, sizeof(new), "%s.%ld", f->filename, (long)time(NULL));
-
-                               /* do it */
-                               if (rename(old,new))
-                                       fprintf(stderr, "Unable to rename file '%s' to '%s'\n", old, new);
-                       }
+                       if (rotate)
+                               rotate_file(f->filename);
                }
        }
 
        filesize_reload_needed = 0;
-       
-       init_logger_chain();
-
-       if (logfiles.event_log) {
-               snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, EVENTLOG);
-               if (event_rotate) {
-                       if (!rotatetimestamp) { 
-                               for (x=0;;x++) {
-                                       snprintf(new, sizeof(new), "%s/%s.%d", ast_config_AST_LOG_DIR, EVENTLOG,x);
-                                       myf = fopen(new, "r");
-                                       if (myf)        /* File exists */
-                                               fclose(myf);
-                                       else
-                                               break;
-                               }
-                       } else 
-                               snprintf(new, sizeof(new), "%s/%s.%ld", ast_config_AST_LOG_DIR, EVENTLOG,(long)time(NULL));
-       
-                       /* do it */
-                       if (rename(old,new))
-                               ast_log(LOG_ERROR, "Unable to rename file '%s' to '%s'\n", old, new);
-               }
 
-               eventlog = fopen(old, "a");
-               if (eventlog) {
-                       ast_log(LOG_EVENT, "Restarted Asterisk Event Logger\n");
-                       if (option_verbose)
-                               ast_verbose("Asterisk Event Logger restarted\n");
-               } else {
-                       ast_log(LOG_ERROR, "Unable to create event log: %s\n", strerror(errno));
-                       res = -1;
-               }
-       }
+       init_logger_chain(1 /* locked */);
 
        if (logfiles.queue_log) {
                snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
-               if (queue_rotate) {
-                       if (!rotatetimestamp) { 
-                               for (x = 0; ; x++) {
-                                       snprintf(new, sizeof(new), "%s/%s.%d", ast_config_AST_LOG_DIR, queue_log_name, x);
-                                       myf = fopen(new, "r");
-                                       if (myf)        /* File exists */
-                                               fclose(myf);
-                                       else
-                                               break;
-                               }
-       
-                       } else 
-                               snprintf(new, sizeof(new), "%s/%s.%ld", ast_config_AST_LOG_DIR, queue_log_name,(long)time(NULL));
-                       /* do it */
-                       if (rename(old, new))
-                               ast_log(LOG_ERROR, "Unable to rename file '%s' to '%s'\n", old, new);
-               }
+               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_log(LOG_EVENT, "Restarted Asterisk Queue Logger\n");
-                       if (option_verbose)
-                               ast_verbose("Asterisk Queue Logger restarted\n");
+                       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;
                }
        }
 
-       AST_LIST_UNLOCK(&logchannels);
+       AST_RWLIST_UNLOCK(&logchannels);
 
        return res;
 }
 
-static int handle_logger_reload(int fd, int argc, char *argv[])
+/*! \brief Reload the logger module without rotating log files (also used from loader.c during
+       a full Asterisk reload) */
+int logger_reload(void)
 {
-       if (reload_logger(0)) {
-               ast_cli(fd, "Failed to reload the logger\n");
+       if(reload_logger(0))
                return RESULT_FAILURE;
-       } else
-               return RESULT_SUCCESS;
+       return RESULT_SUCCESS;
 }
 
-static int handle_logger_rotate(int fd, int argc, char *argv[])
+static char *handle_logger_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "logger reload";
+               e->usage = 
+                       "Usage: logger reload\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)) {
+               ast_cli(a->fd, "Failed to reload the logger\n");
+               return CLI_FAILURE;
+       }
+       return CLI_SUCCESS;
+}
+
+static char *handle_logger_rotate(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "logger rotate";
+               e->usage = 
+                       "Usage: logger rotate\n"
+                       "       Rotates and Reopens the log files.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;    
+       }
        if (reload_logger(1)) {
-               ast_cli(fd, "Failed to reload the logger and rotate log files\n");
-               return RESULT_FAILURE;
+               ast_cli(a->fd, "Failed to reload the logger and rotate log files\n");
+               return CLI_FAILURE;
+       } 
+       return CLI_SUCCESS;
+}
+
+static char *handle_logger_set_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       int x;
+       int state;
+       int level = -1;
+
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "logger set level {DEBUG|NOTICE|WARNING|ERROR|VERBOSE|DTMF} {on|off}";
+               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;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
+       if (a->argc < 5)
+               return CLI_SHOWUSAGE;
+
+       AST_RWLIST_WRLOCK(&logchannels);
+
+       for (x = 0; x < ARRAY_LEN(levels); x++) {
+               if (levels[x] && !strcasecmp(a->argv[3], levels[x])) {
+                       level = x;
+                       break;
+               }
+       }
+
+       AST_RWLIST_UNLOCK(&logchannels);
+
+       state = ast_true(a->argv[4]) ? 1 : 0;
+
+       if (level != -1) {
+               ast_console_toggle_loglevel(a->fd, level, state);
+               ast_cli(a->fd, "Logger status for '%s' has been set to '%s'.\n", levels[level], state ? "on" : "off");
        } else
-               return RESULT_SUCCESS;
+               return CLI_SHOWUSAGE;
+
+       return CLI_SUCCESS;
 }
 
 /*! \brief CLI command to show logging system configuration */
-static int handle_logger_show_channels(int fd, int argc, char *argv[])
+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 "
        struct logchannel *chan;
-
-       ast_cli(fd,FORMATL, "Channel", "Type", "Status");
-       ast_cli(fd, "Configuration\n");
-       ast_cli(fd,FORMATL, "-------", "----", "------");
-       ast_cli(fd, "-------------\n");
-       AST_LIST_LOCK(&logchannels);
-       AST_LIST_TRAVERSE(&logchannels, chan, list) {
-               ast_cli(fd, FORMATL, chan->filename, chan->type==LOGTYPE_CONSOLE ? "Console" : (chan->type==LOGTYPE_SYSLOG ? "Syslog" : "File"),
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "logger show channels";
+               e->usage = 
+                       "Usage: logger show channels\n"
+                       "       List configured logger channels.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;    
+       }
+       ast_cli(a->fd, FORMATL, "Channel", "Type", "Status");
+       ast_cli(a->fd, "Configuration\n");
+       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->disabled ? "Disabled" : "Enabled");
-               ast_cli(fd, " - ");
-               if (chan->logmask & (1 << __LOG_DEBUG)) 
-                       ast_cli(fd, "Debug ");
-               if (chan->logmask & (1 << __LOG_DTMF)) 
-                       ast_cli(fd, "DTMF ");
-               if (chan->logmask & (1 << __LOG_VERBOSE)) 
-                       ast_cli(fd, "Verbose ");
-               if (chan->logmask & (1 << __LOG_WARNING)) 
-                       ast_cli(fd, "Warning ");
-               if (chan->logmask & (1 << __LOG_NOTICE)) 
-                       ast_cli(fd, "Notice ");
-               if (chan->logmask & (1 << __LOG_ERROR)) 
-                       ast_cli(fd, "Error ");
-               if (chan->logmask & (1 << __LOG_EVENT)) 
-                       ast_cli(fd, "Event ");
-               ast_cli(fd, "\n");
+               ast_cli(a->fd, " - ");
+               for (level = 0; level < ARRAY_LEN(levels); level++) {
+                       if (chan->logmask & (1 << level)) {
+                               ast_cli(a->fd, "%s ", levels[level]);
+                       }
+               }
+               ast_cli(a->fd, "\n");
        }
-       AST_LIST_UNLOCK(&logchannels);
-       ast_cli(fd, "\n");
+       AST_RWLIST_UNLOCK(&logchannels);
+       ast_cli(a->fd, "\n");
                
-       return RESULT_SUCCESS;
+       return CLI_SUCCESS;
 }
 
 struct verb {
@@ -581,32 +747,13 @@ struct verb {
        AST_LIST_ENTRY(verb) list;
 };
 
-static AST_LIST_HEAD_STATIC(verbosers, verb);
-
-static char logger_reload_help[] =
-"Usage: logger reload\n"
-"       Reloads the logger subsystem state.  Use after restarting syslogd(8) if you are using syslog logging.\n";
-
-static char logger_rotate_help[] =
-"Usage: logger rotate\n"
-"       Rotates and Reopens the log files.\n";
-
-static char logger_show_channels_help[] =
-"Usage: logger show channels\n"
-"       List configured logger channels.\n";
+static AST_RWLIST_HEAD_STATIC(verbosers, verb);
 
 static struct ast_cli_entry cli_logger[] = {
-       { { "logger", "show", "channels", NULL }, 
-       handle_logger_show_channels, "List configured log channels",
-       logger_show_channels_help },
-
-       { { "logger", "reload", NULL }, 
-       handle_logger_reload, "Reopens the log files",
-       logger_reload_help },
-
-       { { "logger", "rotate", NULL }, 
-       handle_logger_rotate, "Rotates and reopens the log files",
-       logger_rotate_help },
+       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")
 };
 
 static int handle_SIGXFSZ(int sig) 
@@ -616,54 +763,48 @@ static int handle_SIGXFSZ(int sig)
        return 0;
 }
 
-static void ast_log_vsyslog(int level, const char *file, int line, const char *function, char *str)
+static void ast_log_vsyslog(struct logmsg *msg)
 {
        char buf[BUFSIZ];
+       int syslog_level = ast_syslog_priority_from_loglevel(msg->level);
 
-       if (level >= SYSLOG_NLEVELS) {
+       if (syslog_level < 0) {
                /* we are locked here, so cannot ast_log() */
-               fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", level);
+               fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", msg->level);
                return;
        }
 
-       if (level == __LOG_VERBOSE) {
-               snprintf(buf, sizeof(buf), "VERBOSE[%ld]: %s", (long)GETTID(), str);
-               level = __LOG_DEBUG;
-       } else if (level == __LOG_DTMF) {
-               snprintf(buf, sizeof(buf), "DTMF[%ld]: %s", (long)GETTID(), str);
-               level = __LOG_DEBUG;
+       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[level], (long)GETTID(), file, line, function, str);
-        }
+                        levels[msg->level], msg->process_id, msg->file, msg->line, msg->function, msg->message);
+       }
 
-        term_strip(buf, buf, strlen(buf) + 1);
-        syslog(syslog_level_map[level], "%s", buf);
+       term_strip(buf, buf, strlen(buf) + 1);
+       syslog(syslog_level, "%s", buf);
 }
 
-/* Print a normal log message to the channels */
+/*! \brief Print a normal log message to the channels */
 static void logger_print_normal(struct logmsg *logmsg)
 {
        struct logchannel *chan = NULL;
        char buf[BUFSIZ];
 
-       AST_LIST_LOCK(&logchannels);
+       AST_RWLIST_RDLOCK(&logchannels);
 
-       if (logfiles.event_log && logmsg->level == __LOG_EVENT) {
-               fprintf(eventlog, "%s asterisk[%ld]: %s", logmsg->date, (long)getpid(), logmsg->str);
-               fflush(eventlog);
-               AST_LIST_UNLOCK(&logchannels);
-               return;
-       }
-
-       if (!AST_LIST_EMPTY(&logchannels)) {
-               AST_LIST_TRAVERSE(&logchannels, chan, list) {
+       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)
                                continue;
                        /* Check syslog channels */
                        if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << logmsg->level))) {
-                               ast_log_vsyslog(logmsg->level, logmsg->file, logmsg->line, logmsg->function, logmsg->str);
+                               ast_log_vsyslog(logmsg);
                        /* Console channels */
                        } else if (chan->type == LOGTYPE_CONSOLE && (chan->logmask & (1 << logmsg->level))) {
                                char linestr[128];
@@ -678,26 +819,27 @@ static void logger_print_normal(struct logmsg *logmsg)
                                /* Build string to print out */
                                snprintf(buf, sizeof(buf), "[%s] %s[%ld]: %s:%s %s: %s",
                                         logmsg->date,
-                                        term_color(tmp1, levels[logmsg->level], colors[logmsg->level], 0, sizeof(tmp1)),
-                                        (long)GETTID(),
+                                        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->str);
+                                        logmsg->message);
                                /* Print out */
-                               ast_console_puts_mutable(buf);
+                               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)
+                               if (!chan->fileptr) {
                                        continue;
-                               
+                               }
+
                                /* Print out to the file */
                                res = fprintf(chan->fileptr, "[%s] %s[%ld] %s: %s",
-                                             logmsg->date, levels[logmsg->level], (long)GETTID(), logmsg->file, logmsg->str);
-                               if (res <= 0 && !ast_strlen_zero(logmsg->str)) {
+                                             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);
@@ -711,37 +853,35 @@ static void logger_print_normal(struct logmsg *logmsg)
                        }
                }
        } else if (logmsg->level != __LOG_VERBOSE) {
-               fputs(logmsg->str, stdout);
+               fputs(logmsg->message, stdout);
        }
 
-       AST_LIST_UNLOCK(&logchannels);
+       AST_RWLIST_UNLOCK(&logchannels);
 
        /* If we need to reload because of the file size, then do so */
        if (filesize_reload_needed) {
-               reload_logger(1);
-               ast_log(LOG_EVENT, "Rotated Logs Per SIGXFSZ (Exceeded file size limit)\n");
-               if (option_verbose)
-                       ast_verbose("Rotated Logs Per SIGXFSZ (Exceeded file size limit)\n");
+               reload_logger(-1);
+               ast_verb(1, "Rotated Logs Per SIGXFSZ (Exceeded file size limit)\n");
        }
 
        return;
 }
 
-/* Print a verbose message to the verbosers */
+/*! \brief Print a verbose message to the verbosers */
 static void logger_print_verbose(struct logmsg *logmsg)
 {
        struct verb *v = NULL;
 
        /* Iterate through the list of verbosers and pass them the log message string */
-       AST_LIST_LOCK(&verbosers);
-       AST_LIST_TRAVERSE(&verbosers, v, list)
-               v->verboser(logmsg->str);
-       AST_LIST_UNLOCK(&verbosers);
+       AST_RWLIST_RDLOCK(&verbosers);
+       AST_RWLIST_TRAVERSE(&verbosers, v, list)
+               v->verboser(logmsg->message);
+       AST_RWLIST_UNLOCK(&verbosers);
 
        return;
 }
 
-/* Actual logging thread */
+/*! \brief Actual logging thread */
 static void *logger_thread(void *data)
 {
        struct logmsg *next = NULL, *msg = NULL;
@@ -749,16 +889,17 @@ static void *logger_thread(void *data)
        for (;;) {
                /* We lock the message list, and see if any message exists... if not we wait on the condition to be signalled */
                AST_LIST_LOCK(&logmsgs);
-               if (AST_LIST_EMPTY(&logmsgs))
-                       ast_cond_wait(&logcond, &logmsgs.lock);
+               if (AST_LIST_EMPTY(&logmsgs)) {
+                       if (close_logger_thread) {
+                               break;
+                       } else {
+                               ast_cond_wait(&logcond, &logmsgs.lock);
+                       }
+               }
                next = AST_LIST_FIRST(&logmsgs);
                AST_LIST_HEAD_INIT_NOLOCK(&logmsgs);
                AST_LIST_UNLOCK(&logmsgs);
 
-               /* If we should stop, then stop */
-               if (close_logger_thread)
-                       break;
-
                /* Otherwise go through and process each message in the order added */
                while ((msg = next)) {
                        /* Get the next entry now so that we can free our current structure later */
@@ -771,8 +912,12 @@ static void *logger_thread(void *data)
                                logger_print_verbose(msg);
 
                        /* Free the data since we are done */
-                       free(msg);
+                       ast_free(msg);
                }
+
+               /* If we should stop, then stop */
+               if (close_logger_thread)
+                       break;
        }
 
        return NULL;
@@ -784,7 +929,7 @@ int init_logger(void)
        int res = 0;
 
        /* auto rotate if sig SIGXFSZ comes a-knockin */
-       (void) signal(SIGXFSZ,(void *) handle_SIGXFSZ);
+       (void) signal(SIGXFSZ, (void *) handle_SIGXFSZ);
 
        /* start logger thread */
        ast_cond_init(&logcond, NULL);
@@ -794,27 +939,12 @@ int init_logger(void)
        }
 
        /* register the logger cli commands */
-       ast_cli_register_multiple(cli_logger, sizeof(cli_logger) / sizeof(struct ast_cli_entry));
+       ast_cli_register_multiple(cli_logger, ARRAY_LEN(cli_logger));
 
-       mkdir(ast_config_AST_LOG_DIR, 0755);
+       ast_mkdir(ast_config_AST_LOG_DIR, 0777);
   
        /* create log channels */
-       init_logger_chain();
-
-       /* create the eventlog */
-       if (logfiles.event_log) {
-               mkdir(ast_config_AST_LOG_DIR, 0755);
-               snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_LOG_DIR, EVENTLOG);
-               eventlog = fopen(tmp, "a");
-               if (eventlog) {
-                       ast_log(LOG_EVENT, "Started Asterisk Event Logger\n");
-                       if (option_verbose)
-                               ast_verbose("Asterisk Event Logger Started %s\n", tmp);
-               } else {
-                       ast_log(LOG_ERROR, "Unable to create event log: %s\n", strerror(errno));
-                       res = -1;
-               }
-       }
+       init_logger_chain(0 /* locked */);
 
        if (logfiles.queue_log) {
                snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
@@ -834,19 +964,17 @@ void close_logger(void)
        ast_cond_signal(&logcond);
        AST_LIST_UNLOCK(&logmsgs);
 
-       AST_LIST_LOCK(&logchannels);
+       if (logthread != AST_PTHREADT_NULL)
+               pthread_join(logthread, NULL);
 
-       if (eventlog) {
-               fclose(eventlog);
-               eventlog = NULL;
-       }
+       AST_RWLIST_WRLOCK(&logchannels);
 
        if (qlog) {
                fclose(qlog);
                qlog = NULL;
        }
 
-       AST_LIST_TRAVERSE(&logchannels, f, list) {
+       AST_RWLIST_TRAVERSE(&logchannels, f, list) {
                if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) {
                        fclose(f->fileptr);
                        f->fileptr = NULL;
@@ -855,7 +983,7 @@ void close_logger(void)
 
        closelog(); /* syslog */
 
-       AST_LIST_UNLOCK(&logchannels);
+       AST_RWLIST_UNLOCK(&logchannels);
 
        return;
 }
@@ -867,27 +995,28 @@ void ast_log(int level, const char *file, int line, const char *function, const
 {
        struct logmsg *logmsg = NULL;
        struct ast_str *buf = NULL;
-       struct tm tm;
-       time_t t;
+       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)))
                return;
 
-       if (AST_LIST_EMPTY(&logchannels)) {
+       if (AST_RWLIST_EMPTY(&logchannels)) {
                /*
                 * we don't have the logger chain configured yet,
                 * so just log to stdout
                 */
                if (level != __LOG_VERBOSE) {
-                       int res;
+                       int result;
                        va_start(ap, fmt);
-                       res = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
+                       result = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
                        va_end(ap);
-                       if (res != AST_DYNSTR_BUILD_FAILED) {
-                               term_filter_escapes(buf->str);
-                               fputs(buf->str, stdout);
+                       if (result != AST_DYNSTR_BUILD_FAILED) {
+                               term_filter_escapes(ast_str_buffer(buf));
+                               fputs(ast_str_buffer(buf), stdout);
                        }
                }
                return;
@@ -906,10 +1035,6 @@ void ast_log(int level, const char *file, int line, const char *function, const
        if (!(global_logmask & (1 << level)))
                return;
        
-       /* Ignore anything other than the currently debugged file if there is one */
-       if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file))
-               return;
-
        /* Build string */
        va_start(ap, fmt);
        res = ast_str_set_va(&buf, BUFSIZ, fmt, ap);
@@ -920,25 +1045,27 @@ void ast_log(int level, const char *file, int line, const char *function, const
                return;
 
        /* Create a new logging message */
-       if (!(logmsg = ast_calloc(1, sizeof(*logmsg) + res + 1)))
+       if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128)))
                return;
-       
+
        /* Copy string over */
-       strcpy(logmsg->str, buf->str);
+       ast_string_field_set(logmsg, message, ast_str_buffer(buf));
 
        /* Set type to be normal */
        logmsg->type = LOGMSG_NORMAL;
 
        /* Create our date/time */
-       time(&t);
-       ast_localtime(&t, &tm, NULL);
-       strftime(logmsg->date, sizeof(logmsg->date), dateformat, &tm);
+       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->file = file;
        logmsg->line = line;
-       logmsg->function = function;
+       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) {
@@ -948,87 +1075,121 @@ void ast_log(int level, const char *file, int line, const char *function, const
                AST_LIST_UNLOCK(&logmsgs);
        } else {
                logger_print_normal(logmsg);
-               free(logmsg);
+               ast_free(logmsg);
        }
 
        return;
 }
 
+#ifdef HAVE_BKTR
+
+struct ast_bt *ast_bt_create(void) 
+{
+       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_bt_get_addresses(bt);
+
+       return bt;
+}
+
+int ast_bt_get_addresses(struct ast_bt *bt)
+{
+       bt->num_frames = backtrace(bt->addresses, AST_MAX_BT_FRAMES);
+
+       return 0;
+}
+
+void *ast_bt_destroy(struct ast_bt *bt)
+{
+       if (bt->alloced) {
+               ast_free(bt);
+       }
+
+       return NULL;
+}
+
+#endif /* HAVE_BKTR */
+
 void ast_backtrace(void)
 {
-#ifdef Linux
-#ifdef AST_DEVMODE
-       int count=0, i=0;
-       void **addresses;
+#ifdef HAVE_BKTR
+       struct ast_bt *bt;
+       int i = 0;
        char **strings;
 
-       if ((addresses = ast_calloc(MAX_BACKTRACE_FRAMES, sizeof(*addresses)))) {
-               count = backtrace(addresses, MAX_BACKTRACE_FRAMES);
-               if ((strings = backtrace_symbols(addresses, count))) {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Got %d backtrace record%c\n", count, count != 1 ? 's' : ' ');
-                       for (i=0; i < count ; i++) {
-                               if (option_debug)
-                                       ast_log(LOG_DEBUG, "#%d: [%08X] %s\n", i, (unsigned int)addresses[i], strings[i]);
-                       }
-                       free(strings);
-               } else {
-                       if (option_debug)
-                               ast_log(LOG_DEBUG, "Could not allocate memory for backtrace\n");
+       if (!(bt = ast_bt_create())) {
+               ast_log(LOG_WARNING, "Unable to allocate space for backtrace structure\n");
+               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' : ' ');
+               for (i = 0; i < bt->num_frames; i++) {
+                       ast_log(LOG_DEBUG, "#%d: [%p] %s\n", i, bt->addresses[i], strings[i]);
                }
-               free(addresses);
+
+               /* MALLOC_DEBUG will erroneously report an error here, unless we undef the macro. */
+#undef free
+               free(strings);
+       } else {
+               ast_debug(1, "Could not allocate memory for backtrace\n");
        }
+       ast_bt_destroy(bt);
 #else
-       ast_log(LOG_WARNING, "Must run configure with '--enable-dev-mode' for stack backtraces.\n");
-#endif
-#else /* ndef Linux */
-       ast_log(LOG_WARNING, "Inline stack backtraces are only available on the Linux platform.\n");
+       ast_log(LOG_WARNING, "Must run configure with '--with-execinfo' for stack backtraces.\n");
 #endif
 }
 
-void ast_verbose(const char *fmt, ...)
+void __ast_verbose_ap(const char *file, int line, const char *func, const char *fmt, va_list ap)
 {
        struct logmsg *logmsg = NULL;
        struct ast_str *buf = NULL;
        int res = 0;
-       va_list ap;
 
        if (!(buf = ast_str_thread_get(&verbose_buf, VERBOSE_BUF_INIT_SIZE)))
                return;
 
+       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;
+       }
+
        /* Build string */
-       va_start(ap, fmt);
        res = ast_str_set_va(&buf, 0, fmt, ap);
-       va_end(ap);
 
        /* If the build failed then we can drop this allocated message */
        if (res == AST_DYNSTR_BUILD_FAILED)
                return;
 
-       if (!(logmsg = ast_calloc(1, sizeof(*logmsg) + res + 1)))
+       if (!(logmsg = ast_calloc_with_stringfields(1, struct logmsg, res + 128)))
                return;
 
-       strcpy(logmsg->str, buf->str);
+       ast_string_field_set(logmsg, message, ast_str_buffer(buf));
 
-       ast_log(LOG_VERBOSE, logmsg->str);
+       ast_log(__LOG_VERBOSE, file, line, func, "%s", logmsg->message + 1);
 
        /* Set type */
        logmsg->type = LOGMSG_VERBOSE;
        
-       if (ast_opt_timestamp) {
-               time_t t;
-               struct tm tm;
-               char date[40];
-               char *datefmt;
-
-               time(&t);
-               ast_localtime(&t, &tm, NULL);
-               strftime(date, sizeof(date), dateformat, &tm);
-               datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1);
-               sprintf(datefmt, "[%s] %s", date, fmt);
-               fmt = datefmt;
-       }
-
        /* Add to the list and poke the thread if possible */
        if (logthread != AST_PTHREADT_NULL) {
                AST_LIST_LOCK(&logmsgs);
@@ -1037,10 +1198,31 @@ void ast_verbose(const char *fmt, ...)
                AST_LIST_UNLOCK(&logmsgs);
        } else {
                logger_print_verbose(logmsg);
-               free(logmsg);
+               ast_free(logmsg);
        }
 }
 
+void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       __ast_verbose_ap(file, line, func, fmt, ap);
+       va_end(ap);
+}
+
+/* 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, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       __ast_verbose_ap("", 0, "", fmt, ap);
+       va_end(ap);
+}
+
 int ast_register_verbose(void (*v)(const char *string)) 
 {
        struct verb *verb;
@@ -1050,9 +1232,9 @@ int ast_register_verbose(void (*v)(const char *string))
 
        verb->verboser = v;
 
-       AST_LIST_LOCK(&verbosers);
-       AST_LIST_INSERT_HEAD(&verbosers, verb, list);
-       AST_LIST_UNLOCK(&verbosers);
+       AST_RWLIST_WRLOCK(&verbosers);
+       AST_RWLIST_INSERT_HEAD(&verbosers, verb, list);
+       AST_RWLIST_UNLOCK(&verbosers);
        
        return 0;
 }
@@ -1061,16 +1243,115 @@ int ast_unregister_verbose(void (*v)(const char *string))
 {
        struct verb *cur;
 
-       AST_LIST_LOCK(&verbosers);
-       AST_LIST_TRAVERSE_SAFE_BEGIN(&verbosers, cur, list) {
+       AST_RWLIST_WRLOCK(&verbosers);
+       AST_RWLIST_TRAVERSE_SAFE_BEGIN(&verbosers, cur, list) {
                if (cur->verboser == v) {
-                       AST_LIST_REMOVE_CURRENT(&verbosers, list);
-                       free(cur);
+                       AST_RWLIST_REMOVE_CURRENT(list);
+                       ast_free(cur);
                        break;
                }
        }
-       AST_LIST_TRAVERSE_SAFE_END
-       AST_LIST_UNLOCK(&verbosers);
+       AST_RWLIST_TRAVERSE_SAFE_END;
+       AST_RWLIST_UNLOCK(&verbosers);
        
        return cur ? 0 : -1;
 }
+
+static void update_logchannels(void)
+{
+       struct logchannel *cur;
+
+       AST_RWLIST_WRLOCK(&logchannels);
+
+       global_logmask = 0;
+
+       AST_RWLIST_TRAVERSE(&logchannels, cur, list) {
+               cur->logmask = make_components(cur->components, cur->lineno);
+               global_logmask |= cur->logmask;
+       }
+
+       AST_RWLIST_UNLOCK(&logchannels);
+}
+
+int ast_logger_register_level(const char *name)
+{
+       unsigned int level;
+       unsigned int available = 0;
+
+       AST_RWLIST_WRLOCK(&logchannels);
+
+       for (level = 0; level < ARRAY_LEN(levels); level++) {
+               if ((level >= 16) && !available && !levels[level]) {
+                       available = level;
+                       continue;
+               }
+
+               if (levels[level] && !strcasecmp(levels[level], name)) {
+                       ast_log(LOG_WARNING,
+                               "Unable to register dynamic logger level '%s': a standard logger level uses that name.\n",
+                               name);
+                       AST_RWLIST_UNLOCK(&logchannels);
+
+                       return -1;
+               }
+       }
+
+       if (!available) {
+               ast_log(LOG_WARNING,
+                       "Unable to register dynamic logger level '%s'; maximum number of levels registered.\n",
+                       name);
+               AST_RWLIST_UNLOCK(&logchannels);
+
+               return -1;
+       }
+
+       levels[available] = ast_strdup(name);
+
+       AST_RWLIST_UNLOCK(&logchannels);
+
+       ast_debug(1, "Registered dynamic logger level '%s' with index %d.\n", name, available);
+
+       update_logchannels();
+
+       return available;
+}
+
+void ast_logger_unregister_level(const char *name)
+{
+       unsigned int found = 0;
+       unsigned int x;
+
+       AST_RWLIST_WRLOCK(&logchannels);
+
+       for (x = 16; x < ARRAY_LEN(levels); x++) {
+               if (!levels[x]) {
+                       continue;
+               }
+
+               if (strcasecmp(levels[x], name)) {
+                       continue;
+               }
+
+               found = 1;
+               break;
+       }
+
+       if (found) {
+               /* take this level out of the global_logmask, to ensure that no new log messages
+                * will be queued for it
+                */
+
+               global_logmask &= ~(1 << x);
+
+               free(levels[x]);
+               levels[x] = NULL;
+               AST_RWLIST_UNLOCK(&logchannels);
+
+               ast_debug(1, "Unregistered dynamic logger level '%s' with index %d.\n", name, x);
+
+               update_logchannels();
+       } else {
+               AST_RWLIST_UNLOCK(&logchannels);
+       }
+}
+