hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing logging to externcmd.c

Browse Source 
Not all failures caused an error to be logged.
This commit is contained in:
Markus Makela
2015-11-26 12:12:10 +02:00
parent 573af3c4c1
commit 230978f6db
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/externcmd.c
View File

@ -107,12 +107,16 @@ EXTERNCMD* externcmd_allocate(char* argstr)
} }
else else
{ {
MXS_ERROR("Failed to parse argument string for external command: %s",
argstr);
externcmd_free(cmd); externcmd_free(cmd);
cmd = NULL; cmd = NULL;
} }
} }
else else
{ {
MXS_ERROR("Memory allocation for external command parameters failed when "
"processing '%s'.", argstr);
free(cmd); free(cmd);
free(argv); free(argv);
cmd = NULL; cmd = NULL;

6
server/core/monitor.c
View File

@ -785,7 +785,8 @@ monitor_launch_script(MONITOR* mon, MONITOR_SERVERS* ptr, char* script)
if (cmd == NULL) if (cmd == NULL)
{ {
MXS_ERROR("Failed to initialize script: %s", script); MXS_ERROR("Failed to initialize script '%s'. See previous errors for the "
"cause of this failure.", script);
return; return;
} }
@ -795,8 +796,7 @@ monitor_launch_script(MONITOR* mon, MONITOR_SERVERS* ptr, char* script)
if (externcmd_execute(cmd)) if (externcmd_execute(cmd))
{ {
MXS_ERROR("Failed to execute script " MXS_ERROR("Failed to execute script '%s' on server state change event %s.",
"'%s' on server state change event %s.",
script, mon_get_event_name(ptr)); script, mon_get_event_name(ptr));
} }
externcmd_free(cmd); externcmd_free(cmd);