From: mkr <mkr@opencascade.com>
Date: Mon, 27 Nov 2006 10:22:57 +0000 (+0000)
Subject: Fix for PAL13967 : Distributed supervision graphs - Problem with "SALOME_trace".
X-Git-Tag: V3_2_3pre4~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=85babc0a8a3195d90c98112a60b5c0f8121a599c;p=modules%2Fkernel.git

Fix for PAL13967 : Distributed supervision graphs - Problem with "SALOME_trace".
---

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 46e27dbc4..4fe50b01f 100644
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -785,6 +785,7 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer
 
   tempOutputFile << "export LD_LIBRARY_PATH" << endl;
   tempOutputFile << "export PYTHONPATH" << endl;
+  tempOutputFile << "export SALOME_trace=local" << endl; // mkr : 27.11.2006 : PAL13967 - Distributed supervision graphs - Problem with "SALOME_trace"
   //tempOutputFile << "source " << resInfo.PreReqFilePath << endl;
 
   // ! env vars
diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
index 14f07cf6a..ffec729d5 100644
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
@@ -92,11 +92,17 @@ LocalTraceBufferPool* LocalTraceBufferPool::instance()
 
 	  // --- start a trace Collector
 
-	  char* traceKind = getenv("SALOME_trace");
+	  char* traceKind;
+	  bool isNotDefined = false;
+	  if ( getenv("SALOME_trace") )
+	    traceKind = getenv("SALOME_trace");
+	  else
+	    isNotDefined = true; // mkr : 27.11.2006 : PAL13967 - Distributed supervision graphs - Problem with "SALOME_trace"
+	  
 	  assert(traceKind);
 	  //cerr<<"SALOME_trace="<<traceKind<<endl;
 
-	  if (strcmp(traceKind,"local")==0)
+	  if ( isNotDefined || strcmp(traceKind,"local")==0 )
 	    {
 	      _myThreadTrace = LocalTraceCollector::instance();
 	    }