aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-08-21 16:29:15 +0200
committerLukas Larsson <[email protected]>2014-08-21 16:29:15 +0200
commitcffe162d9ddce58b2aaf71a102f3b6c6738a2029 (patch)
tree218228fd487df86a77f162483ad447a99110835b /erts/epmd/src
parent22be3fb9a0c158133c8662d1e5d932cc29221ef7 (diff)
parentbaad9722c84ecb41d2278ac9912d30e42c3b4409 (diff)
downloadotp-cffe162d9ddce58b2aaf71a102f3b6c6738a2029.tar.gz
otp-cffe162d9ddce58b2aaf71a102f3b6c6738a2029.tar.bz2
otp-cffe162d9ddce58b2aaf71a102f3b6c6738a2029.zip
Merge branch 'nox/reedr-logging/OTP-12115' into maint
* nox/reedr-logging/OTP-12115: Add number of entries to mnesia copy debug message Add thread index to allocator enomem dump slogan Add run queue index to process dump info Add missing error string to syslog logging in epmd Demote rare debug slogan of message discarding to debug build
Diffstat (limited to 'erts/epmd/src')
-rw-r--r--erts/epmd/src/epmd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 3cfa7a782f..9630e0cdf0 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -498,7 +498,11 @@ static void dbg_gen_printf(int onsyslog,int perr,int from_level,
#ifdef HAVE_SYSLOG_H
if (onsyslog)
{
- erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);
+ int len;
+ len = erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);
+ if (perr != 0 && len < sizeof(buf)) {
+ erts_snprintf(buf+len, sizeof(buf)-len, ": %s", strerror(perr));
+ }
syslog(LOG_ERR,"epmd: %s",buf);
}
#endif