colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ibft: avoid logging multiple lines when ibft fails

Browse Source 
In case of error, ibft prints an error message to stderr
with two trailing newlines. This causes multiple lines
in our logfile. Replace newlines in the error message
by whitespaces.
This commit is contained in:
Thomas Haller
2015-01-31 15:22:59 +01:00
parent 5803854761
commit 205c109741
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/settings/plugins/ibft/reader.c
View File

@@ -119,6 +119,15 @@ read_ibft_blocks (const char *iscsiadm_path,
} }
if (WEXITSTATUS (status) != 0) { if (WEXITSTATUS (status) != 0) {
if (err) {
char *nl;
/* the error message contains newlines. concatenate the lines with whitespace */
for (nl = err; *nl; nl++) {
if (*nl == '\n')
*nl = ' ';
}
}
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED, g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
"iBFT: %s exited with error %d. Message: '%s'", "iBFT: %s exited with error %d. Message: '%s'",
iscsiadm_path, WEXITSTATUS (status), err ? err : "(none)"); iscsiadm_path, WEXITSTATUS (status), err ? err : "(none)");