[Libreoffice-commits] online.git: 2 commits - loolwsd/configure.ac loolwsd/LOOLWSD.cpp

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp  |    8 +++++---
 loolwsd/configure.ac |    1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e121e90f41adaf0a575a517c7c138cefaa4ea5cd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 6 13:43:16 2016 +0300

    We don't use LOOLWSD_LOGFILE in any source code any longer
    
    So no need to emit its definition to config.h.

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index b5f18f4..de85b38 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -128,7 +128,6 @@ if test -n "$with_logfile" ; then
    LOOLWSD_LOGFILE="$with_logfile"
 fi
 AC_SUBST(LOOLWSD_LOGFILE)
-AC_DEFINE_UNQUOTED([LOOLWSD_LOGFILE],["$LOOLWSD_LOGFILE"],[Pathname of the logfile.])
 
 MAX_DOCUMENTS=10
 AS_IF([test -n "$with_max_documents"],
commit 3800c988b6f6857bd5b74d89c5dd847cc762d80e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 6 13:37:57 2016 +0300

    Don't claim log is available in a file if it isn't
    
    Also, when it is, show the actual pathname from loolwsd.xml, not the
    default.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f69c7dc..e24505e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1535,6 +1535,9 @@ void LOOLWSD::initialize(Application& self)
         if (it != logProperties.end())
         {
             setenv("LOOL_LOGFILENAME", it->second.c_str(), true);
+#if ENABLE_DEBUG
+            std::cerr << "\nFull log is available in: " << it->second.c_str() << std::endl;
+#endif
         }
     }
 
@@ -1619,9 +1622,8 @@ void LOOLWSD::initialize(Application& self)
     ServerApplication::initialize(self);
 
 #if ENABLE_DEBUG
-    std::cerr << "\nLaunch this in your browser:\n\n" <<
-        getLaunchURI() <<
-        "\n\nFull log is available in: " << LOOLWSD_LOGFILE << std::endl;
+            std::cerr << "\nLaunch this in your browser:\n\n" <<
+                getLaunchURI() << "\n" << std::endl;
 #endif
 }