Merged revisions 532430 by hand from

https://svn.apache.org/repos/asf/incubator/qpid/branches/trunk/qpid/cpp

------------------------------------------------------------------------
r532750 | aconway | 2007-04-26 10:13:14 -0400 (Thu, 26 Apr 2007) | 4 lines


 - docs/man/qpidd.x: explain file and environment configuration. 
 - src/qpidd.cpp: read config from file.

------------------------------------------------------------------------
r532491 | aconway | 2007-04-25 17:26:53 -0400 (Wed, 25 Apr 2007) | 4 lines

Added environment variables as a source of Qpid configuration.
Option "foo-bar" will be read from env. QPID_FOO_BAR if
not specified on command line.

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@532791 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 63 insertions, 135 deletions

diff --git a/cpp/docs/man/qpidd.x b/cpp/docs/man/qpidd.x
index e60505cc9c..91d3c3a969 100644
--- a/cpp/docs/man/qpidd.x
+++ b/cpp/docs/man/qpidd.x
@@ -1,5 +1,16 @@
 [NAME]
-qpidd \- the Qpid broker daemon
+qpidd \- the Qpid AMQP broker daemon
 
 [DESCRIPTION]
-.\" Add any additional description here
+
+Start the AMQP broker. The broker options can be specified on the command line (e.g. --worker-threads 10), in an environment variable (e.g. export QPID_WORKER_THREADS=10), or as a line in a configuration file (e.g. worker-threads=10).
+
+Command line options take precedence over environment variables, which
+take precedence over the config file.
+
+
+
+
+
+
+
diff --git a/cpp/lib/CommonOptions.cpp b/cpp/lib/CommonOptions.cpp
deleted file mode 100644
index 8efb3a6baa..0000000000
--- a/cpp/lib/CommonOptions.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "CommonOptions.h"
-
-namespace qpid {
-
-const int CommonOptions::DEFAULT_PORT=5672;
-
-CommonOptions::CommonOptions() : trace(false), port(DEFAULT_PORT) {}
-
-void CommonOptions::addTo(po::options_description& desc)
-{
-    using namespace po;
-    desc.add_options()
-        ("trace,t", optValue(trace), "Enable debug tracing" )
-        ("port,p", optValue(port,"PORT"), "Use PORT for AMQP connections.");
-}
-
-} // namespace qpid
-
diff --git a/cpp/lib/CommonOptions.h b/cpp/lib/CommonOptions.h
deleted file mode 100644
index 2a4b9798cd..0000000000
--- a/cpp/lib/CommonOptions.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef QPID_COMMONOPTIONS_H
-#define QPID_COMMONOPTIONS_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <boost/program_options.hpp>
-#include <boost/format.hpp>
-
-namespace qpid { 
-
-/**@Qpid extensions to boost::program_options */
-namespace program_options {
-
-using namespace boost::program_options;
-
-/** @internal Normally only constructed by optValue() */
-template <class T>
-class OptionValue : public typed_value<T> {
-  public:
-    OptionValue(T& value, const std::string& arg)
-        : typed_value<T>(&value), argName(arg) {}
-    std::string name() const { return argName; }
-  private:
-    std::string argName;
-};
-
-/**
- * Like boost::program_options::value() with more convenient signature
- * for updating a value by reference and nicer help formatting.
- * 
- *@param value displayed as default in help, updated from options.
- * Must support ostream << operator.
- *@param arg name for arguments  in help.
- *
- *@see CommonOptions.cpp for example of use.
- */ 
-template<class T>
-value_semantic* optValue(T& value, const char* arg) {
-    std::string val(boost::lexical_cast<std::string>(value));
-    std::string argName(
-        val.empty() ? std::string(arg) :
-        (boost::format("%s (=%s) ") % arg % val).str());
-    return new OptionValue<T>(value, argName);
-}
-
-/**
- * Like boost::program_options::bool_switch but takes reference, not pointer.
- */
-inline value_semantic* optValue(bool& value) { return bool_switch(&value); }
-
-} // namespace program_options
-
-namespace po=program_options;   // Convenience alias.
-
-/**
- * Common options for client and broker
- */
-struct CommonOptions {
-    static const int DEFAULT_PORT;
-
-    CommonOptions();
-
-    bool trace;
-    int port;
-
-    /** Add  members to program_options to be updated */
-    void addTo(po::options_description&);
-};
-
-} // namespace qpid
-
-#endif  /*!QPID_COMMONOPTIONS_H*/
diff --git a/cpp/lib/common/CommonOptions.cpp b/cpp/lib/common/CommonOptions.cpp
index 8efb3a6baa..d4db3660bd 100644
--- a/cpp/lib/common/CommonOptions.cpp
+++ b/cpp/lib/common/CommonOptions.cpp
@@ -17,9 +17,29 @@
  */
 
 #include "CommonOptions.h"
+#include <algorithm>
 
 namespace qpid {
 
+namespace program_options {
+
+char env2optchar(char env) {
+    return (env=='_') ? '-' : tolower(env);
+}
+    
+const std::string envPrefix("QPID_");
+
+std::string env2option(const std::string& env) {
+    if (env.find(envPrefix) ==0) {
+        std::string opt = env.substr(envPrefix.size());
+        std::transform(opt.begin(), opt.end(), opt.begin(), env2optchar);
+        return opt;
+    }
+    return std::string();
+} 
+
+} // namespace program_options
+
 const int CommonOptions::DEFAULT_PORT=5672;
 
 CommonOptions::CommonOptions() : trace(false), port(DEFAULT_PORT) {}
diff --git a/cpp/lib/common/CommonOptions.h b/cpp/lib/common/CommonOptions.h
index 2a4b9798cd..beaeb114e6 100644
--- a/cpp/lib/common/CommonOptions.h
+++ b/cpp/lib/common/CommonOptions.h
@@ -62,6 +62,11 @@ value_semantic* optValue(T& value, const char* arg) {
     return new OptionValue<T>(value, argName);
 }
 
+/** Environment-to-option name mapping.
+ * Maps env variable "QPID_SOME_VAR" to option "some-var"
+ */
+std::string env2option(const std::string& env);
+
 /**
  * Like boost::program_options::bool_switch but takes reference, not pointer.
  */
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index 532636602e..ec8fe570d3 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -24,7 +24,7 @@
 #include <memory>
 #include <config.h>
 #include <unistd.h>
-
+#include <fstream>
 
 using namespace qpid;
 using namespace qpid::broker;
@@ -37,34 +37,53 @@ struct QpiddOptions : public Broker::Options
     bool help;
     bool version;
     bool daemon;
+    string config;
     po::options_description desc;
     
     QpiddOptions() :
-        help(false), version(false), daemon(false), desc("Options")
+        help(false), version(false), daemon(false),
+        config("/etc/qpidd.conf"),
+        desc("Options")
     {
         using namespace po;
         desc.add_options()
             ("daemon,d", optValue(daemon), "Run as a daemon");
         Broker::Options::addTo(desc);
         desc.add_options()
+            ("config", optValue(config, "FILE"), "Configuation file")
             ("help,h", optValue(help), "Print help message")
             ("version,v", optValue(version), "Print version information");
     }
 
     void parse(int argc, char* argv[]) {
         po::variables_map vm;
+        // Earlier sources get precedence.
         po::store(po::parse_command_line(argc, argv, desc), vm);
+        try { 
+            po::store(po::parse_environment(desc, po::env2option), vm);
+        }
+        catch (const logic_error& e) {
+            throw logic_error(string("parsing environment variables: ")
+                              + e.what());
+        }
+        po::notify(vm);         // So we can use the value of config.
+        try {
+            ifstream conf(config.c_str());
+            po::store(po::parse_config_file(conf, desc), vm);
+        }
+        catch (const logic_error& e) {
+            throw logic_error(string("parsing config file: ")+ e.what());
+        }
         po::notify(vm);
     };
     
-    void usage(std::ostream& out) const {
-        out << "Usage: qpidd [OPTIONS]" << endl 
-            << "Start the Qpid AMQP broker." << endl << endl
+    void usage(ostream& out) const {
+        out << "Usage: qpidd [OPTIONS]" << endl << endl
             << desc << endl;
     };
 };
 
-std::ostream& operator<<(std::ostream& out, const QpiddOptions& config)  {
+ostream& operator<<(ostream& out, const QpiddOptions& config)  {
     config.usage(out); return out;
 }