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

Remove unnecessary function from header

Browse Source 
The function was only used in one place.

Also added a debug assertion for the monitor event detection mechanism.
This commit is contained in:
Markus Mäkelä
2017-01-19 15:18:14 +02:00
parent eff34b91fb
commit dbeb208a5c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/maxscale/monitor.h
View File

@ -66,8 +66,6 @@ extern bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int);
mxs_monitor_event_t mon_get_event_type(MXS_MONITOR_SERVERS* node); mxs_monitor_event_t mon_get_event_type(MXS_MONITOR_SERVERS* node);
const char* mon_get_event_name(MXS_MONITOR_SERVERS* node); const char* mon_get_event_name(MXS_MONITOR_SERVERS* node);
void mon_log_state_change(MXS_MONITOR_SERVERS *ptr);
/** /**
* @brief Serialize the servers of a monitor to a file * @brief Serialize the servers of a monitor to a file
* *

3
server/core/monitor.c
View File

@ -917,6 +917,7 @@ mon_get_event_name(MXS_MONITOR_SERVERS* node)
} }
} }
ss_dassert(false);
return "undefined_event"; return "undefined_event";
} }
@ -1176,7 +1177,7 @@ mon_log_connect_error(MXS_MONITOR_SERVERS* database, mxs_connect_result_t rval)
mysql_error(database->con)); mysql_error(database->con));
} }
void mon_log_state_change(MXS_MONITOR_SERVERS *ptr) static void mon_log_state_change(MXS_MONITOR_SERVERS *ptr)
{ {
SERVER srv; SERVER srv;
srv.status = ptr->mon_prev_status; srv.status = ptr->mon_prev_status;