Mercurial > hg > orthanc

changeset 3852:ee0a1211419f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverting default HttpThreadsCount to 50, as this slows performance of integration tests from 40s to 170s
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 Apr 2020 17:39:11 +0200
parents 6498739a3c3c
children ba53d51ffa9a
files NEWS OrthancServer/main.cpp Resources/Configuration.json
diffstat 3 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Mon Apr 20 16:46:44 2020 +0200
+++ b/NEWS	Mon Apr 20 17:39:11 2020 +0200
@@ -34,7 +34,6 @@
 * Error reporting on failure while initializing SSL
 * Fix unit test ParsedDicomFile.ToJsonFlags2 on big-endian architectures
 * Avoid one memcpy of the DICOM buffer on "POST /instances"
-* Default value of "HttpThreadsCount" reduced from 50 to 10
 * Upgraded dependencies for static builds (notably on Windows):
   - civetweb 1.12
   - openssl 1.1.1f
--- a/OrthancServer/main.cpp	Mon Apr 20 16:46:44 2020 +0200
+++ b/OrthancServer/main.cpp	Mon Apr 20 17:39:11 2020 +0200
@@ -906,7 +906,7 @@
       httpDescribeErrors = lock.GetConfiguration().GetBooleanParameter("HttpDescribeErrors", true);
   
       // HTTP server
-      httpServer.SetThreadsCount(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpThreadsCount", 10));
+      httpServer.SetThreadsCount(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpThreadsCount", 50));
       httpServer.SetPortNumber(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpPort", 8042));
       httpServer.SetRemoteAccessAllowed(lock.GetConfiguration().GetBooleanParameter("RemoteAccessAllowed", false));
       httpServer.SetKeepAliveEnabled(lock.GetConfiguration().GetBooleanParameter("KeepAlive", defaultKeepAlive));
--- a/Resources/Configuration.json	Mon Apr 20 16:46:44 2020 +0200
+++ b/Resources/Configuration.json	Mon Apr 20 17:39:11 2020 +0200
@@ -391,11 +391,8 @@
   // caveats: https://eklitzke.org/the-caveats-of-tcp-nodelay
   "TcpNoDelay" : true,
 
-  // Number of threads that are used by the embedded HTTP server.  In
-  // Orthanc <= 1.6.0, the default value was 50. In Orthanc >= 1.6.1,
-  // default is 10 to prevent memory grow in basic setups.
-  // https://groups.google.com/d/msg/orthanc-users/qWqxpvCPv8g/Z8huoA5FDAAJ
-  "HttpThreadsCount" : 10,
+  // Number of threads that are used by the embedded HTTP server.
+  "HttpThreadsCount" : 50,
 
   // If this option is set to "false", Orthanc will run in index-only
   // mode. The DICOM files will not be stored on the drive. Note that