common/FileUtil.cpp | 4 ++-- common/Util.cpp | 4 ++-- kit/ForKit.cpp | 2 +- tools/Connect.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 13768561074d66fa0669628b9d15a802bcfff738 Author: Ashod Nakashian <[email protected]> Date: Mon Dec 19 18:28:26 2016 -0500 wsd: logging updates Change-Id: Icbee0349a3cfda5a56f8d681c779484e18b98ab6 Reviewed-on: https://gerrit.libreoffice.org/32287 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp index ea55548..4c3cce4 100644 --- a/common/FileUtil.cpp +++ b/common/FileUtil.cpp @@ -30,7 +30,7 @@ namespace { void alertAllUsersAndLog(const std::string& message, const std::string& cmd, const std::string& kind) { - Log::error(message); + LOG_ERR(message); Util::alertAllUsers(cmd, kind); } } @@ -93,7 +93,7 @@ namespace FileUtil // Everything OK, rename the file to its proper name if (std::rename(tempFileName.c_str(), fileName.c_str()) == 0) { - Log::debug() << "Renaming " << tempFileName << " to " << fileName << " OK." << Log::end; + LOG_DBG("Renaming " << tempFileName << " to " << fileName << " OK."); return true; } else diff --git a/common/Util.cpp b/common/Util.cpp index b4aa969..ef578b8 100644 --- a/common/Util.cpp +++ b/common/Util.cpp @@ -154,9 +154,9 @@ namespace Util return std::stoi(sResponse); } - catch(const std::exception&) + catch (const std::exception&) { - Log::warn() << "Trying to find memory of invalid/dead PID " << nPid << Log::end; + LOG_WRN("Trying to find memory of invalid/dead PID " << nPid); } return -1; diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp index cda0303..a40ad8b 100644 --- a/kit/ForKit.cpp +++ b/kit/ForKit.cpp @@ -396,7 +396,7 @@ int main(int argc, char** argv) Process::PID forKitPid = createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath, true); if (forKitPid < 0) { - Log::fatal("Failed to create a kit process."); + LOG_FTL("Failed to create a kit process."); std::_Exit(Application::EXIT_SOFTWARE); } diff --git a/tools/Connect.cpp b/tools/Connect.cpp index d45b243..92dad7c 100644 --- a/tools/Connect.cpp +++ b/tools/Connect.cpp @@ -156,7 +156,7 @@ protected: { if (args.size() < 1) { - Log::error("Usage: connect documentURI [serverURI]"); + LOG_ERR("Usage: connect documentURI [serverURI]"); return Application::EXIT_USAGE; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
