loolwsd/LOOLWSD.cpp | 10 ++++------
loolwsd/README.vars | 4 ++++
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit b57ddcd173c4507097889f3f02e9f600bc9f8476
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Aug 31 17:02:29 2016 +0300
Sort #includes of C++ headers
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index d9d0d5a..1e090ab 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -24,21 +24,19 @@
// parent process that listens on the TCP port and accepts connections from
LOOL clients, and a
// number of child processes, each which handles a viewing (editing) session
for one document.
-#include <cerrno>
-#include <clocale>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <ctime>
-#include <cstdlib>
-
#include <cassert>
+#include <cerrno>
+#include <clocale>
#include <condition_variable>
#include <cstdlib>
#include <cstring>
+#include <ctime>
#include <fstream>
#include <iostream>
#include <map>
commit a5e5d3cdf6278090282007099f71bb3926aa245a
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Aug 31 16:59:43 2016 +0300
Introduce LOOL_NO_LOGCOLOR to enable turning off the annoying colours again
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 0988b4c..d9d0d5a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1400,7 +1400,7 @@ void LOOLWSD::initialize(Application& self)
const auto logLevel = getConfigValue<std::string>(conf, "logging.level",
"trace");
setenv("LOOL_LOGLEVEL", logLevel.c_str(), true);
- const auto withColor = getConfigValue<bool>(conf, "logging.color", true);
+ const auto withColor = !std::getenv("LOOL_NO_LOGCOLOR") &&
getConfigValue<bool>(conf, "logging.color", true);
if (withColor)
setenv("LOOL_LOGCOLOR", "1", true);
diff --git a/loolwsd/README.vars b/loolwsd/README.vars
index 305b9ea..0e45420 100644
--- a/loolwsd/README.vars
+++ b/loolwsd/README.vars
@@ -16,6 +16,10 @@ LOOL_NO_AUTOSAVE <set/unset>
if set avoids automatic saving of the document being
edited.
+LOOL_NO_LOGCOLOR <set/unset>
+ if set avoids use of colour escape sequences in the logging
+ output.
+
SLEEPFORDEBUGGER <seconds to sleep>
sleep <n> seconds in the broken process after starting in
order to allow a 'sudo gdb' session to 'attach <pid>' to them.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
