diff options
Diffstat (limited to 'Source/lib')
| -rw-r--r-- | Source/lib/utils/logger.c | 12 | ||||
| -rw-r--r-- | Source/lib/utils/logger_manager.c | 5 | ||||
| -rw-r--r-- | Source/lib/utils/logger_manager.h | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Source/lib/utils/logger.c b/Source/lib/utils/logger.c index c3888f80f..546de226b 100644 --- a/Source/lib/utils/logger.c +++ b/Source/lib/utils/logger.c @@ -124,11 +124,11 @@ static void prepend_prefix(private_logger_t *this, log_level_t loglevel, char *s if (this->log_thread_id) { - snprintf(buffer, MAX_LOG, "[%c%c] [%s] @%u %s", log_type, log_details, this->name, (int)pthread_self(), string); + snprintf(buffer, MAX_LOG, "[%c%c:%s] @%u %s", log_type, log_details, this->name, (int)pthread_self(), string); } else { - snprintf(buffer, MAX_LOG, "[%c%c] [%s] %s", log_type, log_details, this->name, string); + snprintf(buffer, MAX_LOG, "[%c%c:%s] %s", log_type, log_details, this->name, string); } } @@ -220,11 +220,11 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, char *label, buffer_pos = buffer; if (this->output == NULL) { - syslog(LOG_INFO, "[=>] [%5d] %s %s", line_start, buffer, ascii_buffer); + syslog(LOG_INFO, "[ :%5d] %s %s", line_start, buffer, ascii_buffer); } else { - fprintf(this->output, "[=>] [%5d] %s %s\n", line_start, buffer, ascii_buffer); + fprintf(this->output, "[ :%5d] %s %s\n", line_start, buffer, ascii_buffer); } memset(ascii_buffer, 0, 16); line_start += 16; @@ -257,11 +257,11 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, char *label, buffer_pos = buffer; if (this->output == NULL) { - syslog(LOG_INFO, "[=>] [%5d] %s %16s", line_start, buffer, ascii_buffer); + syslog(LOG_INFO, "[ :%5d] %s %16s", line_start, buffer, ascii_buffer); } else { - fprintf(this->output, "[=>] [%5d] %s %16s\n", line_start, buffer, ascii_buffer); + fprintf(this->output, "[ :%5d] %s %16s\n", line_start, buffer, ascii_buffer); } } pthread_mutex_unlock(&mutex); diff --git a/Source/lib/utils/logger_manager.c b/Source/lib/utils/logger_manager.c index 26d8b7d87..ab2167699 100644 --- a/Source/lib/utils/logger_manager.c +++ b/Source/lib/utils/logger_manager.c @@ -78,7 +78,8 @@ struct { { "PAYLD", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* PAYLOAD */ { "DERDC", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* DER_DECODER */ { "DEREC", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* DER_ENCODER */ - { "ASN_1", ERROR|CONTROL|AUDIT|RAW|LEVEL3, TRUE }, /* ASN1 */ + { "ASN_1", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* ASN1 */ + { "XFRM ", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* XFRM */ }; @@ -198,7 +199,7 @@ void __attribute__ ((constructor)) logger_manager_create() private_logger_manager.loggers[i] = logger_create(logger_defaults[i].name, logger_defaults[i].level, logger_defaults[i].log_thread_ids, - stdout); + INITIAL_LOG_OUTPUT); } } diff --git a/Source/lib/utils/logger_manager.h b/Source/lib/utils/logger_manager.h index 712891fff..08154911a 100644 --- a/Source/lib/utils/logger_manager.h +++ b/Source/lib/utils/logger_manager.h @@ -27,6 +27,7 @@ #include <utils/logger.h> +#define INITIAL_LOG_OUTPUT stderr typedef enum logger_context_t logger_context_t; @@ -57,6 +58,7 @@ enum logger_context_t { DER_DECODER, DER_ENCODER, ASN1, + XFRM, LOGGER_CONTEXT_ROOF, }; |