Merge pull request syslog-ng#5004 from HofiOne/Add-thread-id-to-evt-logging-in-debug-builds

event-logging: Added automatic logging of the thread_id (with tag thread_id) in each event log message for debug builds

Author: HofiOne

lib/messages.c

@@ -25,6 +25,7 @@
 #include "messages.h"
 #include "timeutils/cache.h"
 #include "logmsg/logmsg.h"
+#include "thread-utils.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -35,6 +36,10 @@
 
 #include <evtlog.h>
 
+#if !defined(ADD_THREADID_TAG_TO_EVT_MSGS)
+# define ADD_THREADID_TAG_TO_EVT_MSGS 0
+#endif
+
 enum
 {
   /* processing a non-internal message, we're definitely not recursing */
@@ -233,6 +238,16 @@ msg_event_create(gint prio, const gchar *desc, EVTTAG *tag1, ...)
 
   g_mutex_lock(&evtlog_lock);
   e = evt_rec_init(evt_context, prio, desc);
+
+  /* NOTE: Use ADD_THREADID_TAG_TO_EVT_MSGS during configure to turn on thread_id logging
+   *       Using CMake, it seems to be the only working solution to set it in the env (-D, -e ENv, stc. does not work yet)
+   *       Example:
+   *          CFLAGS="${CFLAGS} -DADD_THREADID_TAG_TO_EVT_MSGS=1" cmake --build build/. --target install -j24 -v
+   */
+#if ADD_THREADID_TAG_TO_EVT_MSGS && SYSLOG_NG_ENABLE_DEBUG
+  evt_rec_add_tag(e, evt_tag_long("thread_id", (long) (void *) get_thread_id()));
+#endif
+
   if (tag1)
     {
       evt_rec_add_tag(e, tag1);