Commit 8fd1b060 authored by Sergei Golubchik's avatar Sergei Golubchik Committed by Sergei Golubchik

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 dd1cad7e
...@@ -597,8 +597,8 @@ static void* sst_joiner_thread (void* a) ...@@ -597,8 +597,8 @@ static void* sst_joiner_thread (void* a)
if (!tmp || strlen(tmp) < (magic_len + 2) || if (!tmp || strlen(tmp) < (magic_len + 2) ||
strncasecmp (tmp, magic, magic_len)) strncasecmp (tmp, magic, magic_len))
{ {
WSREP_ERROR("Failed to read '%s <addr>' from: %s\n\tRead: '%s'", WSREP_ERROR("Failed to read '%s <addr>' (got '%s') from: %s",
magic, arg->cmd, tmp); magic, tmp, arg->cmd);
proc.wait(); proc.wait();
if (proc.error()) err= proc.error(); if (proc.error()) err= proc.error();
} }
...@@ -610,8 +610,8 @@ static void* sst_joiner_thread (void* a) ...@@ -610,8 +610,8 @@ static void* sst_joiner_thread (void* a)
else else
{ {
err= proc.error(); err= proc.error();
WSREP_ERROR("Failed to execute: %s : %d (%s)", WSREP_ERROR("Failed to execute (%M): %s",
arg->cmd, err, strerror(err)); 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