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

MXS-1848 Change monitorCamelCase to monitor_snake_case

Browse Source
This commit is contained in:
Johan Wikman
2018-05-05 16:21:50 +03:00
parent 83f3d6d71d
commit 510eb7ec7c
10 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -25,7 +25,7 @@
#include <maxscale/mysql_utils.h>
#include <maxscale/secrets.h>
#include <maxscale/utils.h>
// TODO: For monitorAddParameters
// TODO: For monitor_add_parameters
#include "../../../core/internal/monitor.h"
using std::string;
@ -890,7 +890,7 @@ void MariaDBMonitor::disable_setting(const char* setting)
MXS_CONFIG_PARAMETER p = {};
p.name = const_cast<char*>(setting);
p.value = const_cast<char*>("false");
monitorAddParameters(m_monitor_base, &p);
monitor_add_parameters(m_monitor_base, &p);
}
/**

10
server/modules/routing/debugcli/debugcmd.cc
View File

@ -213,7 +213,7 @@ struct subcommand showoptions[] =
{0}
},
{
"monitor", 1, 1, (FN)monitorShow,
"monitor", 1, 1, (FN)monitor_show,
"Show monitor details",
"Usage: show monitor MONITOR\n"
"\n"
@ -224,7 +224,7 @@ struct subcommand showoptions[] =
{ARG_TYPE_MONITOR}
},
{
"monitors", 0, 0, (FN)monitorShowAll,
"monitors", 0, 0, (FN)monitor_show_all,
"Show all monitors",
"Usage: show monitors",
{0}
@ -396,7 +396,7 @@ struct subcommand listoptions[] =
{0}
},
{
"monitors", 0, 0, (FN)monitorList,
"monitors", 0, 0, (FN)monitor_list,
"List all monitors",
"Usage: list monitors",
{0}
@ -2409,7 +2409,7 @@ show_log_throttling(DCB *dcb)
static void
shutdown_monitor(DCB *dcb, MXS_MONITOR *monitor)
{
monitorStop(monitor);
monitor_stop(monitor);
}
/**
@ -2421,7 +2421,7 @@ shutdown_monitor(DCB *dcb, MXS_MONITOR *monitor)
static void
restart_monitor(DCB *dcb, MXS_MONITOR *monitor)
{
monitorStart(monitor, monitor->parameters);
monitor_start(monitor, monitor->parameters);
}
/**

2
server/modules/routing/maxinfo/maxinfo.cc
View File

@ -691,7 +691,7 @@ static struct uri_table
{ "/services", serviceGetList },
{ "/listeners", serviceGetListenerList },
{ "/modules", moduleGetList },
{ "/monitors", monitorGetList },
{ "/monitors", monitor_get_list },
{ "/sessions", maxinfoSessionsAll },
{ "/clients", maxinfoClientSessions },
{ "/servers", serverGetList },

6
server/modules/routing/maxinfo/maxinfo_exec.cc
View File

@ -238,7 +238,7 @@ exec_show_monitors(DCB *dcb, MAXINFO_TREE *tree)
{
RESULTSET *set;
if ((set = monitorGetList()) == NULL)
if ((set = monitor_get_list()) == NULL)
{
return;
}
@ -563,7 +563,7 @@ void exec_shutdown_monitor(DCB *dcb, MAXINFO_TREE *tree)
MXS_MONITOR* monitor = monitor_find(tree->value);
if (monitor)
{
monitorStop(monitor);
monitor_stop(monitor);
maxinfo_send_ok(dcb);
}
else
@ -673,7 +673,7 @@ void exec_restart_monitor(DCB *dcb, MAXINFO_TREE *tree)
MXS_MONITOR* monitor = monitor_find(tree->value);
if (monitor)
{
monitorStart(monitor, monitor->parameters);
monitor_start(monitor, monitor->parameters);
maxinfo_send_ok(dcb);
}
else