Merge lp:~vjsamuel/drizzle/fix-rabbitmq-plugin into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

=== modified file 'plugin/rabbitmq/rabbitmq_log.cc'
--- plugin/rabbitmq/rabbitmq_log.cc	2010-07-31 18:32:38 +0000
+++ plugin/rabbitmq/rabbitmq_log.cc	2010-08-15 15:35:56 +0000
@@ -140,6 +140,23 @@
  */
 static int init(drizzled::module::Context &context)
 {
+  const module::option_map &vm= context.getOptions();
+  
+  if (vm.count("username"))
+  {
+    sysvar_rabbitmq_username= const_cast<char *>(vm["username"].as<string>().c_str());
+  }
+
+  if (vm.count("password"))
+  {
+    sysvar_rabbitmq_password= const_cast<char *>(vm["password"].as<string>().c_str());
+  }
+
+  if (vm.count("host"))
+  {
+    sysvar_rabbitmq_host= const_cast<char *>(vm["host"].as<string>().c_str());
+  }
+
   if(sysvar_rabbitmq_log_enabled)
   {
     try 
@@ -259,6 +276,15 @@
   context ("enable",
            po::value<bool>(&sysvar_rabbitmq_log_enabled)->default_value(false)->zero_tokens(),
            N_("Enable rabbitmq log"));
+  context("host", 
+          po::value<string>()->default_value("localhost"),
+          N_("Host name to connect to"));
+  context("username",
+          po::value<string>()->default_value("guest"),
+          N_("RabbitMQ username"));
+  context("password",
+          po::value<string>()->default_value("guest"),
+          N_("RabbitMQ password"));
 }
 
 static drizzle_sys_var* system_variables[]= {

=== modified file 'plugin/rabbitmq/tests/t/variables-master.opt'
--- plugin/rabbitmq/tests/t/variables-master.opt	2010-07-31 18:32:38 +0000
+++ plugin/rabbitmq/tests/t/variables-master.opt	2010-08-15 15:35:56 +0000
@@ -1,1 +1,1 @@
---plugin-add=rabbitmq --rabbitmq.enable --rabbitmq-host=serialcoder --rabbitmq-username=guest --rabbitmq-password=guest
+--plugin-add=rabbitmq --rabbitmq.enable --rabbitmq.host=serialcoder --rabbitmq.username=guest --rabbitmq.password=guest