Merge pull request #6360 from jakesmith/hpcc-12111

HPCC-12111 Use a different sub directory for each slave instance

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

thorlcr/slave/thslavemain.cpp

@@ -353,10 +353,10 @@ int main( int argc, char *argv[]  )
                 globals->setProp("@thorTempDirectory", tempDirStr.str());
             else
                 tempDirStr.append(globals->queryProp("@thorTempDirectory"));
+            addPathSepChar(tempDirStr).append(getMachinePortBase());
+
             logDiskSpace(); // Log before temp space is cleared
-            StringBuffer tempPrefix("thtmp");
-            tempPrefix.append(getMachinePortBase()).append("_");
-            SetTempDir(tempDirStr.str(), tempPrefix.str(), true);
+            SetTempDir(tempDirStr.str(), "thtmp", true);
 
             useMemoryMappedRead(globals->getPropBool("@useMemoryMappedRead"));