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

Make the getCapabitilies entry point optional

Browse Source 
The getCapabilities entry point is no longer required as long as all the
relevant capabilities are added to the static module parameters.
This commit is contained in:
Markus Mäkelä
2017-03-20 10:58:07 +02:00
parent 7bd05d4581
commit dd94374057
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/service.c
View File

@ -488,7 +488,10 @@ int serviceInitialize(SERVICE *service)
if ((service->router_instance = service->router->createInstance(service, router_options)))
{
service->capabilities |= service->router->getCapabilities(service->router_instance);
if (service->router->getCapabilities)
{
service->capabilities |= service->router->getCapabilities(service->router_instance);
}
if (!config_get_global_options()->config_check)
{
@ -1245,7 +1248,10 @@ serviceSetFilters(SERVICE *service, char *filters)
const MXS_MODULE* module = get_module(flist[n - 1]->module, MODULE_FILTER);
ss_dassert(module);
capabilities |= module->module_capabilities;
capabilities |= flist[n - 1]->obj->getCapabilities(flist[n - 1]->filter);
if (flist[n - 1]->obj->getCapabilities)
{
capabilities |= flist[n - 1]->obj->getCapabilities(flist[n - 1]->filter);
}
}
else
{