# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1702027644 -3600
# Node ID 46ed738c3e5d8aae4863ffeede533249c43f847e
# Parent  06eb8bc9f0241c3b05f230271906d30d231c7f15# Parent  d7c9c85d78dc1d4a306413773dd4458155cc8826
merge default -> pg-transactions

diff -r 06eb8bc9f024 -r 46ed738c3e5d OrthancFramework/UnitTestsSources/LoggingTests.cpp
--- a/OrthancFramework/UnitTestsSources/LoggingTests.cpp	Fri Dec 08 09:18:44 2023 +0100
+++ b/OrthancFramework/UnitTestsSources/LoggingTests.cpp	Fri Dec 08 10:27:24 2023 +0100
@@ -69,7 +69,7 @@
                               const std::string& logLine)
 {
   const char* regexStr = "[A-Z][0-9]{4} [0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{6} "
-    "[a-zA-Z\\.\\-_]+:[0-9]+\\] (.*)" EOLSTRING "$";
+    ".{16} [a-zA-Z\\.\\-_]+:[0-9]+\\] (.*)" EOLSTRING "$";
 
   boost::regex regexObj(regexStr);
 
diff -r 06eb8bc9f024 -r 46ed738c3e5d OrthancServer/Sources/main.cpp
--- a/OrthancServer/Sources/main.cpp	Fri Dec 08 09:18:44 2023 +0100
+++ b/OrthancServer/Sources/main.cpp	Fri Dec 08 10:27:24 2023 +0100
@@ -1182,7 +1182,7 @@
       else
       {
         context.SetRestApiWriteToFileSystemEnabled(false);
-        LOG(WARNING) << "REST API cannot write to the file system.";
+        LOG(WARNING) << "REST API cannot write to the file system bacause the \"RestApiWriteToFileSystemEnabled\" configuration is set to false.  The URI /instances/../export is disabled.  This is the most secure configuration.";
       }
 
       if (lock.GetConfiguration().GetBooleanParameter("WebDavEnabled", true))