Merge branch 'develop' into 1.2.1-binlog_router_trx

2015-09-04 22:33:34 +02:00
parent f25b6389fc a9fd7926ac
commit 47b8e661c7
1 changed files with 6 additions and 4 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -979,7 +979,7 @@ process_config_context(CONFIG_CONTEXT *context)
 					s = strtok_r(NULL, ",", &lasts);
 				}
 			}
-			else if (servers == NULL && !isInternalService(router) && strcmp(router,"binlogrouter"))
+			else if (servers == NULL && !isInternalService(router))
 			{
 				LOGIF(LE, (skygw_log_write_flush(
                                        LOGFILE_ERROR,
@ -2299,9 +2299,11 @@ config_percentage_value(char *str)
 }

 static char *InternalRouters[] = {
-	"debugcli",
-	"cli",
-	NULL
+    "debugcli",
+    "cli",
+    "maxinfo",
+    "binlogrouter",
+    NULL
 };

 /**