Attachment 629242 Details for Bug 862899 – trivial patch

[patch] trivial patch

bz862899.patch (text/plain), 2.78 KB, created by Pavel Moravec on 2012-10-18 08:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2012-10-18 08:57:43 UTC

Size: 2.78 KB

patch

obsolete

>diff -rup qpid-0.18_new/cpp/src/posix/QpiddBroker.cpp qpid-0.18_orig/cpp/src/posix/QpiddBroker.cpp
>--- qpid-0.18_new/cpp/src/posix/QpiddBroker.cpp	2012-10-17 15:55:08.757355983 +0200
>+++ qpid-0.18_orig/cpp/src/posix/QpiddBroker.cpp	2012-10-17 14:36:53.956537104 +0200
>@@ -74,7 +74,7 @@ struct DaemonOptions : public qpid::Opti
>             ("daemon,d", optValue(daemon), "Run as a daemon. Logs to syslog by default in this mode.")
>             ("transport", optValue(transport, "TRANSPORT"), "The transport for which to return the port")
>             ("pid-dir", optValue(piddir, "DIR"), "Directory where port-specific PID file is stored")
>-            ("wait,w", optValue(wait, "SECONDS"), "Sets the maximum wait time to initialize or shutdown the daemon. If the daemon fails to initialize/shutdown, prints an error and returns 1")
>+            ("wait,w", optValue(wait, "SECONDS"), "Sets the maximum wait time to initialize the daemon. If the daemon fails to initialize, prints an error and returns 1")
>             ("check,c", optValue(check), "Prints the daemon's process ID to stdout and returns 0 if the daemon is running, otherwise returns 1")
>             ("quit,q", optValue(quit), "Tells the daemon to shut down");
>     }
>@@ -170,7 +170,7 @@ int QpiddBroker::execute (QpiddOptions *
>             if (kill(pid, SIGINT) < 0) 
>                 throw Exception("Failed to stop daemon: " + qpid::sys::strError(errno));
>             // Wait for the process to die before returning
>-            int retry=myOptions->daemon.wait*1000;    // Try up to "--wait N" seconds, do retry every millisecond
>+            int retry=10000;    // Try up to 10 seconds
>             while (kill(pid,0) == 0 && --retry)
>                 sys::usleep(1000);
>             if (retry == 0)
>diff -rup qpid-0.18_new/doc/book/src/cpp-broker/Running-CPP-Broker.xml qpid-0.18_orig/doc/book/src/cpp-broker/Running-CPP-Broker.xml
>--- qpid-0.18_new/doc/book/src/cpp-broker/Running-CPP-Broker.xml	2012-10-17 14:45:50.139409245 +0200
>+++ qpid-0.18_orig/doc/book/src/cpp-broker/Running-CPP-Broker.xml	2012-10-17 14:36:54.106533139 +0200
>@@ -250,9 +250,9 @@ Broker Options:
> 
> Daemon options:
>   -d [ --daemon ]             Run as a daemon.
>-  -w [ --wait ] SECONDS (10)  Sets the maximum wait time to initialize or 
>-                              shutdown the daemon. If the daemon fails to 
>-                              initialize/shutdown, prints an error and returns 1
>+  -w [ --wait ] SECONDS (10)  Sets the maximum wait time to initialize the
>+                              daemon. If the daemon fails to initialize, prints
>+                              an error and returns 1
>   -c [ --check ]              Prints the daemon's process ID to stdout and
>                               returns 0 if the daemon is running, otherwise
>                               returns 1

Actions: View | Diff

Attachments on bug 862899: 629242