Signed-off-by: Adam Stokes astokes@fedoraproject.org --- src/sysconfig/sysconfig-console.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sysconfig/sysconfig-console.cpp b/src/sysconfig/sysconfig-console.cpp index ac40fb8..2b506a1 100644 --- a/src/sysconfig/sysconfig-console.cpp +++ b/src/sysconfig/sysconfig-console.cpp @@ -50,6 +50,7 @@ int main(int argc, char **argv) { qpid::types::Variant::Map options; qpid::types::Variant::Map callOptions; + qpid::messaging::Connection connection; string sessionOptions; ConsoleEvent event; Agent agent; @@ -57,14 +58,15 @@ int main(int argc, char **argv) mh_log_init("sysconfig-console", LOG_TRACE, TRUE);

mh_add_option('U', required_argument, "uri", "URI of configuration", &options, NULL); + mh_add_option('d', no_argument, "daemon", "run as a daemon", NULL, should_daemonize);

- qpid::types::Variant::Map urlMap = mh_parse_options("sysconfig-console", argc, argv, options); + qpid::types::Variant::Map amqp_options = mh_parse_options("sysconfig-console", argc, argv, options);

callOptions["uri"] = options["uri"];

mh_log_init("sysconfig-console", mh_log_level, mh_log_level > LOG_INFO);

- qpid::messaging::Connection connection(urlMap["uri"], options); + connection = mh_connect(options, amqp_options, TRUE); connection.open();

ConsoleSession session(connection, sessionOptions);

If it's a public function, it needs an mh_ prefix.

It would also be good to have doxygen documentation in the header file.

-- Russell Bryant

On Thu, Aug 11, 2011 at 10:45 AM, Adam Stokes astokes@fedoraproject.org wrote:

- moved should_daemonize out of mh_agent location and into    our agent header for easier accessibility

Signed-off-by: Adam Stokes astokes@fedoraproject.org

src/include/matahari/agent.h |    3 +++  src/lib/mh_agent.cpp         |    3 ++-  2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/include/matahari/agent.h b/src/include/matahari/agent.h index b9be90e..a7f7182 100644 --- a/src/include/matahari/agent.h +++ b/src/include/matahari/agent.h @@ -65,6 +65,9 @@ typedef struct mainloop_qmf_s {                              gpointer user_data);  } mainloop_qmf_t;

+extern int +should_daemonize(int code, const char *name, const char *arg, void *userdata);

extern int mh_add_option(     int code, int has_arg, const char *name, const char *description,     void *userdata, int(*callback)(int code, const char *name, const char *arg, void *userdata)); diff --git a/src/lib/mh_agent.cpp b/src/lib/mh_agent.cpp index f7dd768..44396d3 100644 --- a/src/lib/mh_agent.cpp +++ b/src/lib/mh_agent.cpp @@ -462,7 +462,8 @@ mh_add_option(int code, int has_arg, const char *name, const char *description,     return -1;  }

-static int should_daemonize(int code, const char *name, const char *arg, void *userdata) +int +should_daemonize(int code, const char *name, const char *arg, void *userdata)  {  #ifndef WIN32     if (daemon(0, 0) < 0) { -- 1.7.6

---

Matahari mailing list Matahari@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/matahari