Don't write log messages to the umbilical pipe if we don't detach.

If we run in the foreground and are started by the CLI, this would
otherwise cause the first few log messages to appear twice.

diff --git a/src/logger.c b/src/logger.c
index 8fbd3448204d342ddd28427d9db1fdc979f3cf4f..ad7cef280c3d95cb210fcfd8e54920baa29e38d1 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -26,6 +26,7 @@
 #include "logger.h"
 #include "connection.h"
 #include "control_common.h"
+#include "process.h"
 #include "sptps.h"
 
 debug_t debug_level = DEBUG_NOTHING;
@@ -80,7 +81,7 @@ static void real_logger(int level, int priority, const char *message) {
                                break;
                }
 
-               if(umbilical) {
+               if(umbilical && do_detach) {
                        write(umbilical, message, strlen(message));
                        write(umbilical, "\n", 1);
                }

diff --git a/src/sptps_speed.c b/src/sptps_speed.c
index ab41e8d5f388b83f3efa89741f593f9b5667b75b..d03246c51d3204ae7fca2a9fcb516db773bdb074 100644 (file)
--- a/src/sptps_speed.c
+++ b/src/sptps_speed.c
@@ -33,6 +33,7 @@ bool send_request(void *c, const char *msg, ...) { return false; }
 struct list_t *connection_list = NULL;
 bool send_meta(void *c, const char *msg , int len) { return false; }
 char *logfilename = NULL;
+bool do_detach = false;
 struct timeval now;
 
 static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 38c2c08ee60418b67f1c135cba86e2dfcb4237f5..f83307fe5c68cf98f7ffee45a997c06177b205f6 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -35,6 +35,7 @@ bool send_request(void *c, const char *msg, ...) { return false; }
 struct list_t *connection_list = NULL;
 bool send_meta(void *c, const char *msg , int len) { return false; }
 char *logfilename = NULL;
+bool do_detach = false;
 struct timeval now;
 
 static bool verbose;