Merge lp:~miguelaraujo/mysql-proxy/loaded-plugins-logging into lp:mysql-proxy/0.8

[Miguel Araújo]

Updated plugins chassis name value;
Added logging for the loaded plugins.

[Jan Kneschke (jan-kneschke)]

1) don't prefix all plugin names by "MySQL" when logging. It is up to the plugin to define its full name it wants to announce

2) remove the CHASSIS_NEWLINE from the g_critical() to get rid of the double newline. g_critical() (as all g_log() functions) always adds a newline itself.

review: Needs Fixing

[lp:~miguelaraujo/mysql-proxy/loaded-plugins-logging]

1229. By Miguel Araújo on 2012-01-23

Removed "MySQL" prefix when logging loaded plugins names, and unnecessary CHASSIS_NEWLINE;

[Jan Kneschke (jan-kneschke)]

After a 2nd thought: stick with the old plugin names (proxy, debug, ...) and log it as:

  g_critical("plugin %s %s started", p->name, p->version);

review: Needs Fixing

[lp:~miguelaraujo/mysql-proxy/loaded-plugins-logging]

1230. By Miguel Araújo on 2012-01-23

Reverted to old plugin names and altered logging message sintax

Unmerged revisions

=== modified file 'plugins/admin/admin-plugin.c'
--- plugins/admin/admin-plugin.c	2011-08-30 14:58:00 +0000
+++ plugins/admin/admin-plugin.c	2012-01-23 16:53:27 +0000
@@ -618,7 +618,7 @@
 
 G_MODULE_EXPORT int plugin_init(chassis_plugin *p) {
 	p->magic        = CHASSIS_PLUGIN_MAGIC;
-	p->name         = g_strdup("admin");
+	p->name         = g_strdup("Proxy Admin");
 	p->version		= g_strdup(PACKAGE_VERSION);
 
 	p->init         = network_mysqld_admin_plugin_new;

=== modified file 'plugins/cli/cli-plugin.c'
--- plugins/cli/cli-plugin.c	2010-04-06 14:26:51 +0000
+++ plugins/cli/cli-plugin.c	2012-01-23 16:53:27 +0000
@@ -556,8 +556,8 @@
 int plugin_init(chassis_plugin *p) {
 	/* append the our init function to the init-hook-list */
 	p->magic        = CHASSIS_PLUGIN_MAGIC;
-	p->name         = g_strdup("cli");
-	p->version		= g_strdup("0.7.0");
+	p->name         = g_strdup("Proxy Client");
+	p->version		= g_strdup(PACKAGE_VERSION);
 
 	p->init         = network_mysqld_cli_plugin_init;
 	p->get_options  = network_mysqld_cli_plugin_get_options;

=== modified file 'plugins/debug/debug-plugin.c'
--- plugins/debug/debug-plugin.c	2010-09-02 12:56:11 +0000
+++ plugins/debug/debug-plugin.c	2012-01-23 16:53:27 +0000
@@ -429,7 +429,7 @@
 
 G_MODULE_EXPORT int plugin_init(chassis_plugin *p) {
 	p->magic        = CHASSIS_PLUGIN_MAGIC;
-	p->name         = g_strdup("debug");
+	p->name         = g_strdup("Proxy Debug");
 	p->version		= g_strdup(PACKAGE_VERSION);
 
 	p->init         = network_mysqld_debug_plugin_new;

=== modified file 'plugins/proxy/proxy-plugin.c'
--- plugins/proxy/proxy-plugin.c	2011-09-21 18:48:19 +0000
+++ plugins/proxy/proxy-plugin.c	2012-01-23 16:53:27 +0000
@@ -2221,7 +2221,7 @@
 
 G_MODULE_EXPORT int plugin_init(chassis_plugin *p) {
 	p->magic        = CHASSIS_PLUGIN_MAGIC;
-	p->name         = g_strdup("proxy");
+	p->name         = g_strdup("Proxy");
 	p->version		= g_strdup(PACKAGE_VERSION);
 
 	p->init         = network_mysqld_proxy_plugin_new;

=== modified file 'plugins/replicant/replicant-plugin.c'
--- plugins/replicant/replicant-plugin.c	2011-08-30 14:58:00 +0000
+++ plugins/replicant/replicant-plugin.c	2012-01-23 16:53:27 +0000
@@ -822,7 +822,7 @@
 
 G_MODULE_EXPORT int plugin_init(chassis_plugin *p) {
 	p->magic        = CHASSIS_PLUGIN_MAGIC;
-	p->name         = g_strdup("replicant");
+	p->name         = g_strdup("Proxy Replicant");
 	p->version		= g_strdup(PACKAGE_VERSION);
 	/* append the our init function to the init-hook-list */
 

=== modified file 'src/chassis-frontend.c'
--- src/chassis-frontend.c	2011-10-13 10:56:04 +0000
+++ src/chassis-frontend.c	2012-01-23 16:53:27 +0000
@@ -524,6 +524,20 @@
 	lua_close(L);
 }
 
+/**
+ * log the versions of the initialized plugins
+*/
+int chassis_frontend_log_plugin_versions(GPtrArray *plugins) {
+	guint i;
+
+	for (i = 0; i < plugins->len; i++) {
+		chassis_plugin *p = plugins->pdata[i];
+
+		g_critical("%s %s started", p->name, p->version);
+	}
+
+	return 0;
+}
 
 int chassis_frontend_write_pidfile(const char *pid_file, GError **gerr) {
 	int fd;

=== modified file 'src/chassis-frontend.h'
--- src/chassis-frontend.h	2010-07-07 07:57:26 +0000
+++ src/chassis-frontend.h	2012-01-23 16:53:27 +0000
@@ -151,6 +151,11 @@
 CHASSIS_API void chassis_frontend_print_lua_version();
 
 /**
+ * log the versions of the initialized plugins
+*/
+CHASSIS_API int chassis_frontend_log_plugin_versions(GPtrArray *plugins);
+
+/**
  * write the PID to a file
  *
  * @param  pid_file name of the PID file

=== modified file 'src/mysql-proxy-cli.c'
--- src/mysql-proxy-cli.c	2011-09-08 09:13:48 +0000
+++ src/mysql-proxy-cli.c	2012-01-23 16:53:27 +0000
@@ -564,10 +564,10 @@
 		}
 	}
 
-	/* the message has to be _after_ the g_option_content_parse() to 
-	 * hide from the output if the --help is asked for
+	/* 
+	 * log the versions of all loaded plugins
 	 */
-	g_message("%s started", PACKAGE_STRING); /* add tag to the logfile (after we opened the logfile) */
+	chassis_frontend_log_plugin_versions(srv->modules);
 
 #ifdef _WIN32
 	if (chassis_win32_is_service()) chassis_win32_service_set_state(SERVICE_RUNNING, 0);