diff options
Diffstat (limited to 'libnetdata/log/log.c')
| -rw-r--r-- | libnetdata/log/log.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/libnetdata/log/log.c b/libnetdata/log/log.c index 7849aedc4..95d3d98d4 100644 --- a/libnetdata/log/log.c +++ b/libnetdata/log/log.c @@ -796,6 +796,8 @@ void fatal_int( const char *file, const char *function, const unsigned long line // save a copy of errno - just in case this function generates a new error int __errno = errno; va_list args; + const char *thread_tag; + char os_threadname[NETDATA_THREAD_NAME_MAX + 1]; if(error_log_syslog) { va_start( args, fmt ); @@ -803,14 +805,22 @@ void fatal_int( const char *file, const char *function, const unsigned long line va_end( args ); } + thread_tag = netdata_thread_tag(); + if (!netdata_thread_tag_exists()) { + os_thread_get_current_name_np(os_threadname); + if ('\0' != os_threadname[0]) { /* If it is not an empty string replace "MAIN" thread_tag */ + thread_tag = os_threadname; + } + } + char date[LOG_DATE_LENGTH]; log_date(date, LOG_DATE_LENGTH); log_lock(); va_start( args, fmt ); - if(debug_flags) fprintf(stderr, "%s: %s FATAL : %s : (%04lu@%-10.10s:%-15.15s): ", date, program_name, netdata_thread_tag(), line, file, function); - else fprintf(stderr, "%s: %s FATAL : %s :", date, program_name, netdata_thread_tag()); + if(debug_flags) fprintf(stderr, "%s: %s FATAL : %s : (%04lu@%-10.10s:%-15.15s): ", date, program_name, thread_tag, line, file, function); + else fprintf(stderr, "%s: %s FATAL : %s : ", date, program_name, thread_tag); vfprintf( stderr, fmt, args ); va_end( args ); @@ -820,10 +830,11 @@ void fatal_int( const char *file, const char *function, const unsigned long line log_unlock(); char action_data[70+1]; - snprintfz(action_data, 70, "%04lu@%-10.10s:%-15.15s/%d", line, file, function, __errno); - char action_result[60+1]; - snprintfz(action_result, 60, "%s:%s",program_name, strcmp(program_name,"STREAM_RECEIVER")?netdata_thread_tag():"[x]"); - send_statistics("FATAL", action_result, action_data); + snprintfz(action_data, 70, "%04lu@%-10.10s:%-15.15s/%d", line, file, function, __errno); + char action_result[60+1]; + + snprintfz(action_result, 60, "%s:%s", program_name, strncmp(thread_tag, "STREAM_RECEIVER", strlen("STREAM_RECEIVER")) ? thread_tag : "[x]"); + send_statistics("FATAL", action_result, action_data); netdata_cleanup_and_exit(1); } |