HPCC-31755 Soapcall LOG multi-line separator 2

Signed-off-by: M Kelly <mark.kelly+copilot@lexisnexisrisk.com>
hpcc-systems · Oct 6, 2024 · 66f249b · 66f249b
1 parent 608dee7
commit 66f249b
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 19 deletions.
diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp
@@ -50,7 +50,41 @@ using roxiemem::OwnedRoxieString;
 #define CONNECTION "Connection"
 
 unsigned soapTraceLevel = 1;
-StringBuffer soapSepString("");
+StringBuffer soapSepString;
+static CriticalSection soapCrit;
+
+void setSoapSepString(StringBuffer &_soapSepString)
+{
+    CriticalBlock b(soapCrit);
+    soapSepString.clear().append(_soapSepString);
+}
+
+static void multiLineAppendReplace(StringBuffer &origStr, StringBuffer &newStr)
+{
+    if (origStr.isEmpty())
+        return;
+    const char *cursor = origStr;
+    while (cursor)
+    {
+        switch (*cursor)
+        {
+            case '\0':
+                return;
+            case '\r':
+                newStr.append(soapSepString);
+                if ('\n' == *(cursor+1))
+                    cursor++;
+                break;
+            case '\n':
+                newStr.append(soapSepString);
+                break;
+            default:
+                newStr.append(*cursor);
+                break;
+        }
+        ++cursor;
+    }
+}
 
 #define WSCBUFFERSIZE 0x10000
 #define MAXWSCTHREADS 50    //Max Web Service Call Threads
@@ -1952,16 +1986,14 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
     {
         if (soapTraceLevel > 6 || master->logXML)
         {
-            StringBuffer contentStr("");
+            StringBuffer contentStr;
             if (contentEncoded)
                 contentStr.append(", content encoded.");
             if ( (master->logXML) && (soapSepString.length() > 0) )
             {
-                StringBuffer request2(request);
-                request2.replaceString("\r\n", soapSepString.str());
-                request2.replaceString("\r", soapSepString.str());
-                request2.replaceString("\n", soapSepString.str());
-                master->logctx.mCTXLOG("%s: request(%s)%s", master->wscCallTypeText(), request2.str(), contentStr.str());
+                StringBuffer request2;
+                multiLineAppendReplace(request, request2);
+                master->logctx.CTXLOG("%s: request(%s)%s", master->wscCallTypeText(), request2.str(), contentStr.str());
             }
             else
                 master->logctx.mCTXLOG("%s: request(%s)%s", master->wscCallTypeText(), request.str(), contentStr.str());
@@ -2263,12 +2295,10 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
         {
             if ( (master->logXML) && (soapSepString.length() > 0) )
             {
-                StringBuffer response2(dbgheader);
-                response2.append(response);
-                response2.replaceString("\r\n", soapSepString.str());
-                response2.replaceString("\r", soapSepString.str());
-                response2.replaceString("\n", soapSepString.str());
-                master->logctx.mCTXLOG("%s: LEN=%d %sresponse(%s)", getWsCallTypeName(master->wscType),response.length(),chunked?"CHUNKED ":"", response2.str());
+                StringBuffer response2;
+                multiLineAppendReplace(dbgheader, response2);
+                multiLineAppendReplace(response, response2);
+                master->logctx.CTXLOG("%s: LEN=%d %sresponse(%s)", getWsCallTypeName(master->wscType),response.length(),chunked?"CHUNKED ":"", response2.str());
             }
             else
                 master->logctx.mCTXLOG("%s: LEN=%d %sresponse(%s%s)", getWsCallTypeName(master->wscType),response.length(),chunked?"CHUNKED ":"", dbgheader.str(), response.str());

diff --git a/common/thorhelper/thorsoapcall.hpp b/common/thorhelper/thorsoapcall.hpp
@@ -86,6 +86,6 @@ interface IRoxieAbortMonitor
 extern THORHELPER_API unsigned soapTraceLevel;
 extern THORHELPER_API IWSCHelper * createSoapCallHelper(IWSCRowProvider *, IEngineRowAllocator * outputAllocator, const char *authToken, SoapCallMode scMode, ClientCertificate *clientCert, const IContextLogger &logctx, IRoxieAbortMonitor * roxieAbortMonitor);
 extern THORHELPER_API IWSCHelper * createHttpCallHelper(IWSCRowProvider *, IEngineRowAllocator * outputAllocator, const char *authToken, SoapCallMode scMode, ClientCertificate *clientCert, const IContextLogger &logctx, IRoxieAbortMonitor * roxieAbortMonitor);
-extern THORHELPER_API StringBuffer soapSepString;
+extern THORHELPER_API void setSoapSepString(StringBuffer &_soapSepString);
 
 #endif /* __THORSOAPCALL_HPP_ */
diff --git a/ecl/hthor/hthor.cpp b/ecl/hthor/hthor.cpp
@@ -7741,8 +7741,7 @@ void CHThorWSCBaseActivity::init()
     StringBuffer soapSepStr;
     StringBufferAdaptor soapSepAdaptor(soapSepStr);
     agent.queryWorkUnit()->getDebugValue("soapLogSepString", soapSepAdaptor);
-    if (!soapSepStr.isEmpty())
-        soapSepString.clear().append(soapSepStr);
+    setSoapSepString(soapSepStr);
 }
 
 //---------------------------------------------------------------------------

diff --git a/roxie/ccd/ccdmain.cpp b/roxie/ccd/ccdmain.cpp
@@ -889,7 +889,11 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
         roxiemem::setMemTraceLevel(topology->getPropInt("@memTraceLevel", runOnce ? 0 : 1));
         soapTraceLevel = topology->getPropInt("@soapTraceLevel", runOnce ? 0 : 1);
         if (topology->hasProp("@soapLogSepString"))
-            topology->getProp("@soapLogSepString", soapSepString);
+        {
+            StringBuffer tmpSepString;
+            topology->getProp("@soapLogSepString", tmpSepString);
+            setSoapSepString(tmpSepString);
+        }
         miscDebugTraceLevel = topology->getPropInt("@miscDebugTraceLevel", 0);
         traceRemoteFiles = topology->getPropBool("@traceRemoteFiles", false);
         testAgentFailure = topology->getPropInt("expert/@testAgentFailure", testAgentFailure);

diff --git a/roxie/ccd/ccdstate.cpp b/roxie/ccd/ccdstate.cpp
@@ -2928,7 +2928,11 @@ class CRoxiePackageSetManager : implements IRoxieQueryPackageManagerSet, impleme
             else if (stricmp(queryName, "control:soapLogSepString")==0)
             {
                 if (control->hasProp("@string"))
-                    control->getProp("@string", soapSepString);
+                {
+                    StringBuffer tmpSepString;
+                    control->getProp("@string", tmpSepString);
+                    setSoapSepString(tmpSepString);
+                }
             }
             else if (stricmp(queryName, "control:socketCheckInterval")==0)
             {

diff --git a/thorlcr/graph/thgraph.cpp b/thorlcr/graph/thgraph.cpp
@@ -2750,7 +2750,9 @@ void CJobBase::init()
     failOnLeaks = getOptBool(THOROPT_FAIL_ON_LEAKS);
     maxLfnBlockTimeMins = getOptInt(THOROPT_MAXLFN_BLOCKTIME_MINS, DEFAULT_MAXLFN_BLOCKTIME_MINS);
     soapTraceLevel = getOptInt(THOROPT_SOAP_TRACE_LEVEL, 1);
-    getOpt(THOROPT_SOAP_LOG_SEP_STRING, soapSepString);
+    StringBuffer tmpSepString;
+    getOpt(THOROPT_SOAP_LOG_SEP_STRING, tmpSepString);
+    setSoapSepString(tmpSepString);
 
     StringBuffer tracing("maxActivityCores = ");
     if (maxActivityCores)