diff --git a/changes-entries/linux-log-tid.txt b/changes-entries/linux-log-tid.txt new file mode 100644 index 0000000000..9f6ce95397 --- /dev/null +++ b/changes-entries/linux-log-tid.txt @@ -0,0 +1 @@ + *) core: On Linux, log the real thread ID in error logs. [Joe Orton] diff --git a/configure.in b/configure.in index 719f8ac5c3..c56c8972af 100644 --- a/configure.in +++ b/configure.in @@ -562,6 +562,12 @@ pid_t t = syscall(SYS_gettid); return t == -1 ? 1 : 0; }, fi fi +case ${host}X${ac_cv_func_gettid}X${ap_cv_gettid} in +*linux-*XyesX* | *linux-*XnoXyes) + AC_DEFINE(DEFAULT_LOG_TID, ["g"], [Define as default argument for thread id in error logging]) + ;; +esac + dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, [AC_TRY_COMPILE([#include diff --git a/server/log.c b/server/log.c index 2f84635a75..1777a64615 100644 --- a/server/log.c +++ b/server/log.c @@ -69,6 +69,10 @@ #undef APLOG_MODULE_INDEX #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX +#ifndef DEFAULT_LOG_TID +#define DEFAULT_LOG_TID NULL +#endif + typedef struct { const char *t_name; int t_val; @@ -907,7 +911,7 @@ static int do_errorlog_default(const ap_errorlog_info *info, char *buf, #if APR_HAS_THREADS field_start = len; len += cpystrn(buf + len, ":tid ", buflen - len); - item_len = log_tid(info, NULL, buf + len, buflen - len); + item_len = log_tid(info, DEFAULT_LOG_TID, buf + len, buflen - len); if (!item_len) len = field_start; else