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

Begin converting EXTERNCMD to a class

Browse Source 
Mostly renaming for now.
This commit is contained in:
Esa Korhonen
2019-05-23 17:40:03 +03:00
parent 5043293b97
commit 11a8488162
4 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/monitor.cc
View File

@ -1054,7 +1054,7 @@ std::string Monitor::child_nodes(MonitorServer* parent)
return ss.str();
}
int Monitor::launch_command(MonitorServer* ptr, EXTERNCMD* cmd)
int Monitor::launch_command(MonitorServer* ptr, ExternalCmd* cmd)
{
if (externcmd_matches(cmd, "$INITIATOR"))
{
@ -1124,7 +1124,7 @@ int Monitor::launch_command(MonitorServer* ptr, EXTERNCMD* cmd)
externcmd_substitute_arg(cmd, "[$]SYNCEDLIST", nodelist);
}
int rv = externcmd_execute(cmd);
int rv = cmd->externcmd_execute();
if (rv)
{
@ -1202,7 +1202,7 @@ int Monitor::launch_script(MonitorServer* ptr)
char arg[strlen(script) + 1];
strcpy(arg, script);
EXTERNCMD* cmd = externcmd_allocate(arg, m_settings.script_timeout);
ExternalCmd* cmd = ExternalCmd::externcmd_allocate(arg, m_settings.script_timeout);
if (cmd == NULL)
{
@ -1214,7 +1214,7 @@ int Monitor::launch_script(MonitorServer* ptr)
int rv = launch_command(ptr, cmd);
externcmd_free(cmd);
ExternalCmd::externcmd_free(cmd);
return rv;
}