Drizzle

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

  1. fix-rabbitmq-plugin
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
Approved revision: 1701
Merged at revision: 1713
Proposed branch: lp:~vjsamuel/drizzle/fix-rabbitmq-plugin
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 50 lines (+27/-1)
2 files modified
plugin/rabbitmq/rabbitmq_log.cc (+26/-0)
plugin/rabbitmq/tests/t/variables-master.opt (+1/-1)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/fix-rabbitmq-plugin
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+32708@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
140 */140 */
141static int init(drizzled::module::Context &context)141static int init(drizzled::module::Context &context)
142{142{
143 const module::option_map &vm= context.getOptions();
144
145 if (vm.count("username"))
146 {
147 sysvar_rabbitmq_username= const_cast<char *>(vm["username"].as<string>().c_str());
148 }
149
150 if (vm.count("password"))
151 {
152 sysvar_rabbitmq_password= const_cast<char *>(vm["password"].as<string>().c_str());
153 }
154
155 if (vm.count("host"))
156 {
157 sysvar_rabbitmq_host= const_cast<char *>(vm["host"].as<string>().c_str());
158 }
159
143 if(sysvar_rabbitmq_log_enabled)160 if(sysvar_rabbitmq_log_enabled)
144 {161 {
145 try 162 try
@@ -259,6 +276,15 @@
259 context ("enable",276 context ("enable",
260 po::value<bool>(&sysvar_rabbitmq_log_enabled)->default_value(false)->zero_tokens(),277 po::value<bool>(&sysvar_rabbitmq_log_enabled)->default_value(false)->zero_tokens(),
261 N_("Enable rabbitmq log"));278 N_("Enable rabbitmq log"));
279 context("host",
280 po::value<string>()->default_value("localhost"),
281 N_("Host name to connect to"));
282 context("username",
283 po::value<string>()->default_value("guest"),
284 N_("RabbitMQ username"));
285 context("password",
286 po::value<string>()->default_value("guest"),
287 N_("RabbitMQ password"));
262}288}
263289
264static drizzle_sys_var* system_variables[]= {290static drizzle_sys_var* system_variables[]= {
265291
=== 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 @@
1--plugin-add=rabbitmq --rabbitmq.enable --rabbitmq-host=serialcoder --rabbitmq-username=guest --rabbitmq-password=guest1--plugin-add=rabbitmq --rabbitmq.enable --rabbitmq.host=serialcoder --rabbitmq.username=guest --rabbitmq.password=guest