[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |   10 +++++-----
 loolwsd/LOOLWSD.hpp |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit df49c23d239215c98aec9e1922d447cf42464299
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Jul 30 22:19:31 2016 -0400

    loolwsd: use getConfigValue
    
    Change-Id: Iccd4ea16424cfb6b8977fc70fc4a39e8b97f0b40
    Reviewed-on: https://gerrit.libreoffice.org/27952
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f6425d2..009a34d 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1346,9 +1346,9 @@ void LOOLWSD::initialize(Application& self)
     // Allow UT to manipulate before using configuration values.
     UnitWSD::get().configure(config());
 
-    const auto logLevel = config().getString("logging.level", "trace");
+    const auto logLevel = getConfigValue<std::string>(conf, "logging.level", "trace");
     setenv("LOOL_LOGLEVEL", logLevel.c_str(), true);
-    const auto withColor = config().getBool("logging.color", true);
+    const auto withColor = getConfigValue<bool>(conf, "logging.color", true);
     if (withColor)
         setenv("LOOL_LOGCOLOR", "1", true);
     Log::initialize("wsd", logLevel, withColor);
@@ -1382,9 +1382,6 @@ void LOOLWSD::initialize(Application& self)
         setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
     }
 
-    Log::warn("Launch this in your browser:");
-    Log::warn(lcl_getLaunchURI());
-
     // In Trial Versions we might want to set some limits.
     LOOLWSD::NumDocBrokers = 0;
     LOOLWSD::NumConnections = 0;
@@ -1399,6 +1396,9 @@ void LOOLWSD::initialize(Application& self)
     StorageBase::initialize();
 
     ServerApplication::initialize(self);
+
+    Log::warn("Launch this in your browser:");
+    Log::warn(lcl_getLaunchURI());
 }
 
 void LOOLWSD::initializeSSL()
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 74fba62..4a3898c 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -88,6 +88,7 @@ private:
 
         void operator()(unsigned int& value) { value = _config.getUInt(_name); }
         void operator()(bool& value) { value = _config.getBool(_name); }
+        void operator()(std::string& value) { value = _config.getString(_name); }
     };
 
     template<typename T>