check plugin type earlier

session-replay-tools · May 21, 2018 · 5f3a73c · 5f3a73c
1 parent e2defcf
commit 5f3a73c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/plugins/proxy/proxy-plugin.c b/plugins/proxy/proxy-plugin.c
@@ -2202,11 +2202,6 @@ chassis_plugin_config *config;
 chassis_plugin_config *
 network_mysqld_proxy_plugin_new(void)
 {
-#ifndef SIMPLE_PARSER
-    g_critical("try loading proxy-plugin.so from shard-edition, exit");
-    exit(1);
-#endif
-
     config = g_new0(chassis_plugin_config, 1);
 
     /* use negative values as defaults to make them ignored */

diff --git a/plugins/shard/shard-plugin.c b/plugins/shard/shard-plugin.c
@@ -2040,11 +2040,6 @@ chassis_plugin_config *config;
 static chassis_plugin_config *
 network_mysqld_shard_plugin_new(void)
 {
-#ifdef SIMPLE_PARSER
-    g_critical("try loading shard-plugin.so from rw-edition, exit");
-    exit(1);
-#endif
-
     config = g_new0(chassis_plugin_config, 1);
 
     /* use negative values as defaults to make them ignored */

diff --git a/src/mysql-proxy-cli.c b/src/mysql-proxy-cli.c
@@ -504,6 +504,17 @@ check_plugin_mode_valid(struct chassis_frontend_t *frontend, chassis *srv)
         g_critical("shard & proxy is mutual exclusive");
         return FALSE;
     }
+#ifdef SIMPLE_PARSER
+    if (sharding_mode) {
+        g_critical("try loading shard-plugin.so from rw-edition, exit");
+        return FALSE;
+    }
+#else
+    if (proxy_mode) {
+        g_critical("try loading proxy-plugin.so from shard-edition, exit");
+        return FALSE;
+    }
+#endif
 
     return TRUE;
 }