diff options
| author | Henry Castro <hcastro@collabora.com> | 2021-02-05 16:49:57 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2021-02-26 11:22:58 -0400 |
| commit | 266623aa2d7c99188851a64d80f72110ef40f4eb (patch) | |
| tree | 3a27346df95195f1b2a917d22616078e85263432 /kit | |
| parent | test: run unit test with disabled capabilities (diff) | |
| download | online-266623aa2d7c99188851a64d80f72110ef40f4eb.tar.gz online-266623aa2d7c99188851a64d80f72110ef40f4eb.zip | |
kit: revisit log messages kit.cpp
LOG_FTL = abnormal, crash, denied service
LOG_ERR = load, save, session, connection, wrong parameters
other cases LOG_WRN, LOG_INF
Change-Id: Ieefc881876106b1afc4f34505903f1321b33411b
Signed-off-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'kit')
| -rw-r--r-- | kit/Kit.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kit/Kit.cpp b/kit/Kit.cpp index bb68c7e1d2..7a3459f3e2 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -275,7 +275,7 @@ namespace if (::stat(fpath, &ownerInfo) != 0 || ::chown(linkableCopy.c_str(), ownerInfo.st_uid, ownerInfo.st_gid) != 0) { - LOG_WRN("Failed to stat or chown " << ownerInfo.st_uid << ":" << ownerInfo.st_gid << + LOG_ERR("Failed to stat or chown " << ownerInfo.st_uid << ":" << ownerInfo.st_gid << " " << linkableCopy << ": " << strerror(errno) << " missing cap_chown?, disabling linkable"); unlink(linkableCopy.c_str()); canChown = false; @@ -585,7 +585,7 @@ public: { if (_sessions.find(sessionId) != _sessions.end()) { - LOG_WRN("Session [" << sessionId << "] on url [" << anonymizeUrl(_url) << "] already exists."); + LOG_ERR("Session [" << sessionId << "] on url [" << anonymizeUrl(_url) << "] already exists."); return true; } @@ -1391,7 +1391,7 @@ private: } const std::string abbrMessage = getAbbreviatedMessage(data, size); - LOG_WRN("Child session [" << sessionId << "] not found to forward message: " << abbrMessage); + LOG_ERR("Child session [" << sessionId << "] not found to forward message: " << abbrMessage); } else { @@ -1551,7 +1551,7 @@ public: if (!isFound) { - LOG_WRN("Document::ViewCallback. Session [" << viewId << + LOG_ERR("Document::ViewCallback. Session [" << viewId << "] is no longer active to process [" << lokCallbackTypeToString(type) << "] [" << payload << "] message to Master Session."); } @@ -2022,7 +2022,7 @@ protected: void onDisconnect() override { #if !MOBILEAPP - LOG_WRN("Kit connection lost without exit arriving from wsd. Setting TerminationFlag"); + LOG_ERR("Kit connection lost without exit arriving from wsd. Setting TerminationFlag"); SigUtil::setTerminationFlag(); #endif #ifdef IOS @@ -2206,7 +2206,7 @@ void lokit_main( if (!JailUtil::bind(sysTemplate, jailPathStr) || !JailUtil::remountReadonly(sysTemplate, jailPathStr)) { - LOG_WRN("Failed to mount [" << sysTemplate << "] -> [" << jailPathStr + LOG_ERR("Failed to mount [" << sysTemplate << "] -> [" << jailPathStr << "], will link/copy contents."); return false; } @@ -2230,7 +2230,7 @@ void lokit_main( LOG_INF("Mounting random temp dir " << tmpSubDir << " -> " << jailTmpDir); if (!JailUtil::bind(tmpSubDir, jailTmpDir)) { - LOG_WRN("Failed to mount [" << tmpSubDir << "] -> [" << jailTmpDir + LOG_ERR("Failed to mount [" << tmpSubDir << "] -> [" << jailTmpDir << "], will link/copy contents."); return false; } @@ -2265,7 +2265,7 @@ void lokit_main( // Update the dynamic files inside the jail. if (!JailUtil::SysTemplate::updateDynamicFiles(jailPathStr)) { - LOG_WRN( + LOG_ERR( "Failed to update the dynamic files in the jail [" << jailPathStr << "]. If the systemplate directory is owned by a superuser or is " @@ -2483,7 +2483,7 @@ void lokit_main( #ifndef IOS if (!LIBREOFFICEKIT_HAS(kit, runLoop)) { - LOG_ERR("Kit is missing Unipoll API"); + LOG_FTL("Kit is missing Unipoll API"); std::cout << "Fatal: out of date LibreOfficeKit - no Unipoll API\n"; std::_Exit(EX_SOFTWARE); } |