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

Do not force router_options usage

Browse Source 
The usage of the router_options has become optional in 2.1. This means
that the binlogrouter should not fail to start if no router_options are
defined.

Also lowered the error about master.ini to a warning as it is expected to
happen on a fresh installation.
This commit is contained in:
Markus Mäkelä
2017-11-23 17:26:44 +02:00
parent 927b4addc8
commit 7c21eb3ec4
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/routing/binlogrouter/blr.c
View File

@ -242,13 +242,6 @@ createInstance(SERVICE *service, char **options)
return NULL; return NULL;
} }
if (options == NULL || options[0] == NULL)
{
MXS_ERROR("%s: Error: No router options supplied for binlogrouter",
service->name);
return NULL;
}
/* /*
* We only support one server behind this router, since the server is * We only support one server behind this router, since the server is
* the master from which we replicate binlog records. Therefore check * the master from which we replicate binlog records. Therefore check
@ -623,10 +616,6 @@ createInstance(SERVICE *service, char **options)
} }
} }
} }
else
{
MXS_ERROR("%s: Error: No router options supplied for binlogrouter", service->name);
}
if (inst->masterid) if (inst->masterid)
{ {
@ -754,10 +743,10 @@ createInstance(SERVICE *service, char **options)
{ {
if (rc == -1) if (rc == -1)
{ {
MXS_ERROR("%s: master.ini file not found in %s." MXS_WARNING("%s: master.ini file not found in %s."
" Master registration cannot be started." " Master registration cannot be started."
" Configure with CHANGE MASTER TO ...", " Configure with CHANGE MASTER TO ...",
inst->service->name, inst->binlogdir); inst->service->name, inst->binlogdir);
} }
else else
{ {