Merge lp:~diego-fmpwizard/mysql-proxy/short-options into lp:mysql-proxy

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

Ready for merging.

[Kay Roepke (kay-roepke)]

> Ready for merging.

One thing I'd like to be sure of is the effect of multiple plugins registering the same short option name:
For example, it is possible that a different plugin author tries to use "s" meaning script.

Does the order of loading the plugins affect this, i.e. will the last one win (resulting in the prior plugins to not receive their option)?
If that's the case we need to guard the combining of options with at least a warning (it shouldn't be an error, because the end-user cannot do anything about it).
Until we know the answer, we shouldn't merge this in.

[fmpwizard (diego-fmpwizard)]

Hi,

I know that for the same plugin, the second time you specify an
option, that one will win. But I'm not sure if it makes a difference
if a "different plugin" tries to use the same option.

I can try that and let you know.

Diego

On Sun, May 31, 2009 at 1:44 AM, Kay Roepke <email address hidden> wrote:
>> Ready for merging.
>
> One thing I'd like to be sure of is the effect of multiple plugins registering the same short option name:
> For example, it is possible that a different plugin author tries to use "s" meaning script.
>
> Does the order of loading the plugins affect this, i.e. will the last one win (resulting in the prior plugins to not receive their option)?
> If that's the case we need to guard the combining of options with at least a warning (it shouldn't be an error, because the end-user cannot do anything about it).
> Until we know the answer, we shouldn't merge this in.
> --
> https://code.launchpad.net/~diego-fmpwizard/mysql-proxy/short-options/+merge/6781
> You are the owner of lp:~diego-fmpwizard/mysql-proxy/short-options.
>

--
Diego Medina
Web Developer
http://www.fmpwizard.com

[Kay Roepke (kay-roepke)]

Since the proxy plugin is the only place we have short options yet, I'll approve and merge this.

review: Approve

Unmerged revisions

666. By Diego Medina <email address hidden> on 2009-05-25

Merged the latest code form trunk (multi-th)

=== modified file 'plugins/proxy/proxy-plugin.c'
--- plugins/proxy/proxy-plugin.c	2009-03-31 17:16:15 +0000
+++ plugins/proxy/proxy-plugin.c	2009-05-25 16:06:52 +0000
@@ -1861,15 +1861,15 @@
 	/* make sure it isn't collected */
 	static GOptionEntry config_entries[] = 
 	{
-		{ "proxy-address",            0, 0, G_OPTION_ARG_STRING, NULL, "listening address:port of the proxy-server (default: :4040)", "<host:port>" },
+		{ "proxy-address",            'P', 0, G_OPTION_ARG_STRING, NULL, "listening address:port of the proxy-server (default: :4040)", "<host:port>" },
 		{ "proxy-read-only-backend-addresses", 
-					      0, 0, G_OPTION_ARG_STRING_ARRAY, NULL, "address:port of the remote slave-server (default: not set)", "<host:port>" },
-		{ "proxy-backend-addresses",  0, 0, G_OPTION_ARG_STRING_ARRAY, NULL, "address:port of the remote backend-servers (default: 127.0.0.1:3306)", "<host:port>" },
+					      'r', 0, G_OPTION_ARG_STRING_ARRAY, NULL, "address:port of the remote slave-server (default: not set)", "<host:port>" },
+		{ "proxy-backend-addresses",  'b', 0, G_OPTION_ARG_STRING_ARRAY, NULL, "address:port of the remote backend-servers (default: 127.0.0.1:3306)", "<host:port>" },
 		
 		{ "proxy-skip-profiling",     0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, NULL, "disables profiling of queries (default: enabled)", NULL },
 
 		{ "proxy-fix-bug-25371",      0, 0, G_OPTION_ARG_NONE, NULL, "fix bug #25371 (mysqld > 5.1.12) for older libmysql versions", NULL },
-		{ "proxy-lua-script",         0, 0, G_OPTION_ARG_FILENAME, NULL, "filename of the lua script (default: not set)", "<file>" },
+		{ "proxy-lua-script",         's', 0, G_OPTION_ARG_FILENAME, NULL, "filename of the lua script (default: not set)", "<file>" },
 		
 		{ "no-proxy",                 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, NULL, "don't start the proxy-module (default: enabled)", NULL },