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

Return value of service_alloc wasn't read and caused MaxScale to fail if module load failed.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-05-12 16:59:19 +03:00
parent b7ae1c1784
commit 25cb08cc29
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/config.c
View File

@ -230,13 +230,6 @@ int error_count = 0;
char *version_string = config_get_value(obj->parameters, "version_string"); char *version_string = config_get_value(obj->parameters, "version_string");
if (version_string) {
((SERVICE *)(obj->element))->version_string = strdup(version_string);
} else {
if (gateway.version_string)
((SERVICE *)(obj->element))->version_string = strdup(gateway.version_string);
}
if (obj->element == NULL) /*< if module load failed */ if (obj->element == NULL) /*< if module load failed */
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
@ -249,6 +242,14 @@ int error_count = 0;
obj = obj->next; obj = obj->next;
continue; /*< process next obj */ continue; /*< process next obj */
} }
if (version_string) {
((SERVICE *)(obj->element))->version_string = strdup(version_string);
} else {
if (gateway.version_string)
((SERVICE *)(obj->element))->version_string = strdup(gateway.version_string);
}
max_slave_conn_str = max_slave_conn_str =
config_get_value(obj->parameters, config_get_value(obj->parameters,
"max_slave_connections"); "max_slave_connections");