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

Fix to bug 640: http://bugs.mariadb.com/show_bug.cgi?id=640

Browse Source 
Added a check for the case when createInstance returns NULL.
Added messages to error log if router instance creation fails or if the service fails to start for any reason.
This commit is contained in:
Markus Makela
2014-12-09 06:31:53 +02:00
parent 6a54d888de
commit 8b51d4fee2
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/service.c
View File

@ -349,8 +349,15 @@ serviceStart(SERVICE *service)
SERV_PROTOCOL *port;
int listeners = 0;
service->router_instance = service->router->createInstance(service,
service->routerOptions);
if((service->router_instance = service->router->createInstance(service,
service->routerOptions)) == NULL)
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Failed to start router for service '%s'.",
service->name)));
return listeners;
}
port = service->ports;
while (port)
@ -395,12 +402,21 @@ int
serviceStartAll()
{
SERVICE *ptr;
int n = 0;
int n = 0,i;
ptr = allServices;
while (ptr)
{
n += serviceStart(ptr);
n += (i = serviceStart(ptr));
if(i == 0)
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Failed to start service '%s'.",
ptr->name)));
}
ptr = ptr->next;
}
return n;