diff --git a/coolwsd.xml.in b/coolwsd.xml.in
index bb6c388d28..bb98979a52 100644
--- a/coolwsd.xml.in
+++ b/coolwsd.xml.in
@@ -284,7 +284,7 @@
-
+
diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp
index 5c61173853..cea8f9d4c6 100644
--- a/wsd/COOLWSD.cpp
+++ b/wsd/COOLWSD.cpp
@@ -2698,6 +2698,7 @@ void COOLWSD::innerInitialize(Application& self)
if (getConfigValue(conf, "quarantine_files[@enable]", false))
{
std::string path = Util::trimmed(getPathFromConfig("quarantine_files.path"));
+ LOG_INF("Quarantine path is set to [" << path << "] in config");
if (path.empty())
{
LOG_WRN("Quarantining is enabled via quarantine_files config, but no path is set in "
@@ -2708,6 +2709,10 @@ void COOLWSD::innerInitialize(Application& self)
if (path[path.size() - 1] != '/')
path += '/';
+ if (path[0] != '/')
+ LOG_WRN("Quarantine path is relative. Please use an absolute path for better "
+ "reliability");
+
Poco::File p(path);
try
{
@@ -2729,6 +2734,10 @@ void COOLWSD::innerInitialize(Application& self)
}
}
}
+ else
+ {
+ LOG_INF("Quarantine is disabled in config");
+ }
NumPreSpawnedChildren = getConfigValue(conf, "num_prespawn_children", 1);
if (NumPreSpawnedChildren < 1)
diff --git a/wsd/QuarantineUtil.cpp b/wsd/QuarantineUtil.cpp
index 4f358e9dc1..b5f460e5c1 100644
--- a/wsd/QuarantineUtil.cpp
+++ b/wsd/QuarantineUtil.cpp
@@ -79,7 +79,7 @@ void Quarantine::initialize(const std::string& path)
});
std::vector tokens;
- for (const auto& file : files)
+ for (const std::string& file : files)
{
StringVector::tokenize(file.c_str(), file.size(), Delimiter, tokens);
if (tokens.size() >= 3)