[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit bccfd79d35f7be542831d0a8acaab3dd1fbd19b3
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Jan 19 20:38:43 2016 -0500

    loolwsd: reset http request handler's thread name as it's reused
    
    Change-Id: I62332e1d3018a7ff3cebe3982910792fa75d0c8f
    Reviewed-on: https://gerrit.libreoffice.org/21676
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 98adeb0..f3187d7 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -404,7 +404,8 @@ public:
 
                 if (goodRequest)
                 {
-                    try {
+                    try
+                    {
                         Log::info() << "Perform insertfile: " << formChildid << ", " << formName << Log::end;
                         const std::string dirPath = LOOLWSD::ChildRoot + formChildid
                                                   + JailedDocumentRoot + "insertfile";
@@ -577,6 +578,11 @@ class RequestHandlerFactory: public HTTPRequestHandlerFactory
 public:
     HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request) override
     {
+#ifdef __linux
+            if (prctl(PR_SET_NAME, reinterpret_cast<unsigned long>("request_handler"), 0, 0, 0) != 0)
+                Log::error("Cannot set thread name to request_handler.");
+#endif
+
         auto logger = Log::info();
         logger << "Request from " << request.clientAddress().toString() << ": "
                << request.getMethod() << " " << request.getURI() << " "