sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-12-08 00:00:29 -05:00
Code Issues Projects Releases Wiki Activity

minimized prefixed on stroke logger output

Browse Source
This commit is contained in:
Andreas Steffen 2006-05-31 05:50:04 +00:00
parent 90ed2e8278
commit 6848dac603
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/charon/threads/stroke_interface.c
View File

@ -639,7 +639,7 @@ static void stroke_receive(private_stroke_t *this)
} }
/* setup a logger which writes status to the unix socket */ /* setup a logger which writes status to the unix socket */
this->stroke_logger = logger_create("-", CONTROL|ERROR, FALSE, strokefile); this->stroke_logger = logger_create("", CONTROL|ERROR, FALSE, strokefile);
this->logger->log_bytes(this->logger, RAW, "stroke message", (void*)msg, msg_length); this->logger->log_bytes(this->logger, RAW, "stroke message", (void*)msg, msg_length);

16
src/libstrongswan/utils/logger.c
View File

@ -108,8 +108,9 @@ static int get_thread_number(void)
*/ */
static void prepend_prefix(private_logger_t *this, log_level_t loglevel, const char *string, char *buffer) static void prepend_prefix(private_logger_t *this, log_level_t loglevel, const char *string, char *buffer)
{ {
char thread_id[3] = "";
char log_type, log_details; char log_type, log_details;
u_int8_t thread_id = 0; char *separator = (strlen(this->name) == 0)? "" : ":";
if (loglevel & CONTROL) if (loglevel & CONTROL)
{ {
@ -155,9 +156,10 @@ static void prepend_prefix(private_logger_t *this, log_level_t loglevel, const c
if (this->log_thread_id) if (this->log_thread_id)
{ {
thread_id = get_thread_number(); snprintf(thread_id, sizeof(thread_id), "%02d", get_thread_number());
} }
snprintf(buffer, MAX_LOG, "%02d[%c%c:%s] %s", thread_id, log_type, log_details, this->name, string); snprintf(buffer, MAX_LOG, "%s[%c%c%s%s] %s",
thread_id, log_type, log_details, separator, this->name, string);
} }
/** /**
@ -219,7 +221,7 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
if ((this->level & loglevel) == loglevel) if ((this->level & loglevel) == loglevel)
{ {
u_int8_t thread_id = 0; char thread_id[3] = "";
char buffer[MAX_LOG]; char buffer[MAX_LOG];
char ascii_buffer[MAX_BYTES+1]; char ascii_buffer[MAX_BYTES+1];
@ -241,7 +243,7 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
if (this->log_thread_id) if (this->log_thread_id)
{ {
thread_id = get_thread_number(); snprintf(thread_id, sizeof(thread_id), "%02d", get_thread_number());
} }
if (this->output == NULL) if (this->output == NULL)
@ -277,11 +279,11 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
if (this->output == NULL) if (this->output == NULL)
{ {
syslog(get_priority(loglevel), "%02d[ :%5d] %s %s", thread_id, line_start, buffer, ascii_buffer); syslog(get_priority(loglevel), "%s[ :%5d] %s %s", thread_id, line_start, buffer, ascii_buffer);
} }
else else
{ {
fprintf(this->output, "%02d[ :%5d] %s %s\n", thread_id, line_start, buffer, ascii_buffer); fprintf(this->output, "%s[ :%5d] %s %s\n", thread_id, line_start, buffer, ascii_buffer);
} }
buffer_pos = buffer; buffer_pos = buffer;
line_start += MAX_BYTES; line_start += MAX_BYTES;