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

Allow NULL parameters for start/stop functions

Browse Source 
The functions that start and stop monitors and services now accept NULL
parameters.
This commit is contained in:
Markus Mäkelä
2017-05-02 11:08:56 +03:00
parent 60526f15b8
commit fce0edce8e
2 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/core/service.cc
View File

@ -627,23 +627,24 @@ int service_launch_all()
bool serviceStop(SERVICE *service)
{
SERV_LISTENER *port;
int listeners = 0;
port = service->ports;
while (port)
if (service)
{
if (port->listener && port->listener->session->state == SESSION_STATE_LISTENER)
for (SERV_LISTENER * port = service->ports; port; port = port->next)
{
if (poll_remove_dcb(port->listener) == 0)
if (port->listener && port->listener->session->state == SESSION_STATE_LISTENER)
{
port->listener->session->state = SESSION_STATE_LISTENER_STOPPED;
listeners++;
if (poll_remove_dcb(port->listener) == 0)
{
port->listener->session->state = SESSION_STATE_LISTENER_STOPPED;
listeners++;
}
}
}
port = port->next;
service->state = SERVICE_STATE_STOPPED;
}
service->state = SERVICE_STATE_STOPPED;
return listeners > 0;
}
@ -658,23 +659,25 @@ bool serviceStop(SERVICE *service)
*/
bool serviceStart(SERVICE *service)
{
SERV_LISTENER *port;
int listeners = 0;
port = service->ports;
while (port)
if (service)
{
if (port->listener && port->listener->session->state == SESSION_STATE_LISTENER_STOPPED)
for (SERV_LISTENER* port = service->ports; port; port = port->next)
{
if (poll_add_dcb(port->listener) == 0)
if (port->listener && port->listener->session->state == SESSION_STATE_LISTENER_STOPPED)
{
port->listener->session->state = SESSION_STATE_LISTENER;
listeners++;
if (poll_add_dcb(port->listener) == 0)
{
port->listener->session->state = SESSION_STATE_LISTENER;
listeners++;
}
}
}
port = port->next;
service->state = SERVICE_STATE_STARTED;
}
service->state = SERVICE_STATE_STARTED;
return listeners > 0;
}