Commit 54c301b0 authored by Sergei Golubchik's avatar Sergei Golubchik

10.5: reformat galera sst error messages

put the command line at the end. so that when a very long command line
is truncated, it doesn't take the actual error message with it
parent 8478a06c
......@@ -657,8 +657,8 @@ static void* sst_joiner_thread (void* a)
if (!tmp || strlen(tmp) < (magic_len + 2) ||
strncasecmp (tmp, magic, magic_len))
{
WSREP_ERROR("Failed to read '%s <addr>' from: %s\n\tRead: '%s'",
magic, arg->cmd, tmp);
WSREP_ERROR("Failed to read '%s <addr>' (got '%s') from: %s",
magic, tmp, arg->cmd);
proc.wait();
if (proc.error()) err= proc.error();
}
......@@ -670,8 +670,8 @@ static void* sst_joiner_thread (void* a)
else
{
err= proc.error();
WSREP_ERROR("Failed to execute: %s : %d (%s)",
arg->cmd, err, strerror(err));
WSREP_ERROR("Failed to execute (%M): %s",
err, arg->cmd);
}
/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment