From f247c05b5b92d4d8664bcea8dbae479c1195f2ba Mon Sep 17 00:00:00 2001 From: M Kelly Date: Tue, 8 Oct 2024 10:16:28 -0400 Subject: [PATCH] HPCC-31755 Soapcall LOG multi-line separator 3 Signed-off-by: M Kelly --- common/thorhelper/thorsoapcall.cpp | 6 +++--- common/thorhelper/thorsoapcall.hpp | 2 +- ecl/hthor/hthor.cpp | 2 +- roxie/ccd/ccdmain.cpp | 2 +- roxie/ccd/ccdstate.cpp | 2 +- thorlcr/graph/thgraph.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp index 9743d91476f..d0b5d35363a 100644 --- a/common/thorhelper/thorsoapcall.cpp +++ b/common/thorhelper/thorsoapcall.cpp @@ -50,13 +50,13 @@ using roxiemem::OwnedRoxieString; #define CONNECTION "Connection" unsigned soapTraceLevel = 1; -StringBuffer soapSepString; +static StringBuffer soapSepString; static CriticalSection soapCrit; -void setSoapSepString(StringBuffer &_soapSepString) +void setSoapSepString(const char *_soapSepString) { CriticalBlock b(soapCrit); - soapSepString.clear().append(_soapSepString); + soapSepString.set(_soapSepString); } static void multiLineAppendReplace(StringBuffer &origStr, StringBuffer &newStr) diff --git a/common/thorhelper/thorsoapcall.hpp b/common/thorhelper/thorsoapcall.hpp index 938839bf298..4ea42feef69 100644 --- 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 void setSoapSepString(StringBuffer &_soapSepString); +extern THORHELPER_API void setSoapSepString(const char *_soapSepString); #endif /* __THORSOAPCALL_HPP_ */ diff --git a/ecl/hthor/hthor.cpp b/ecl/hthor/hthor.cpp index b10c4998506..610c15507cc 100644 --- a/ecl/hthor/hthor.cpp +++ b/ecl/hthor/hthor.cpp @@ -7741,7 +7741,7 @@ void CHThorWSCBaseActivity::init() StringBuffer soapSepStr; StringBufferAdaptor soapSepAdaptor(soapSepStr); agent.queryWorkUnit()->getDebugValue("soapLogSepString", soapSepAdaptor); - setSoapSepString(soapSepStr); + setSoapSepString(soapSepStr.str()); } //--------------------------------------------------------------------------- diff --git a/roxie/ccd/ccdmain.cpp b/roxie/ccd/ccdmain.cpp index c14abb8911d..bc17267cfb2 100644 --- a/roxie/ccd/ccdmain.cpp +++ b/roxie/ccd/ccdmain.cpp @@ -892,7 +892,7 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml) { StringBuffer tmpSepString; topology->getProp("@soapLogSepString", tmpSepString); - setSoapSepString(tmpSepString); + setSoapSepString(tmpSepString.str()); } miscDebugTraceLevel = topology->getPropInt("@miscDebugTraceLevel", 0); traceRemoteFiles = topology->getPropBool("@traceRemoteFiles", false); diff --git a/roxie/ccd/ccdstate.cpp b/roxie/ccd/ccdstate.cpp index 8f9e35c7fc2..8a97b2d10d8 100644 --- a/roxie/ccd/ccdstate.cpp +++ b/roxie/ccd/ccdstate.cpp @@ -2931,7 +2931,7 @@ class CRoxiePackageSetManager : implements IRoxieQueryPackageManagerSet, impleme { StringBuffer tmpSepString; control->getProp("@string", tmpSepString); - setSoapSepString(tmpSepString); + setSoapSepString(tmpSepString.str()); } } else if (stricmp(queryName, "control:socketCheckInterval")==0) diff --git a/thorlcr/graph/thgraph.cpp b/thorlcr/graph/thgraph.cpp index ced5ceb327f..0b994cd1af3 100644 --- a/thorlcr/graph/thgraph.cpp +++ b/thorlcr/graph/thgraph.cpp @@ -2752,7 +2752,7 @@ void CJobBase::init() soapTraceLevel = getOptInt(THOROPT_SOAP_TRACE_LEVEL, 1); StringBuffer tmpSepString; getOpt(THOROPT_SOAP_LOG_SEP_STRING, tmpSepString); - setSoapSepString(tmpSepString); + setSoapSepString(tmpSepString.str()); StringBuffer tracing("maxActivityCores = "); if (maxActivityCores)