From cbeef5f2531884bda5552736f9403b7f1da3ec87 Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Fri, 29 Oct 2010 15:19:23 +0000 Subject: [PATCH] Added more detailed log messages --- src/GENERICSOLVER/DEVIATION.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py index 4a1835a..bb5414a 100644 --- a/src/GENERICSOLVER/DEVIATION.py +++ b/src/GENERICSOLVER/DEVIATION.py @@ -19,10 +19,13 @@ # $Id$ # +import os import logging import threading import inspect import traceback +import platform +import thread import salome import GENERICSOLVER_ORB__POA @@ -126,6 +129,11 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen, exc = SALOME.ExceptionStruct(SALOME.INTERNAL_ERROR, message, inspect.stack()[1][1], inspect.stack()[1][2]) raise SALOME.SALOME_Exception(exc) + + def _getIdMessage(self): + return "%s in container %s running on %s, process %d, thread %d" % \ + (self._instanceName, self._containerName, + platform.node(), os.getpid(), thread.get_ident()) def Init(self, studyId, detCaseEntry): """ @@ -133,7 +141,7 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen, use with OpenTURNS in SALOME 5.1.5 and later (for YACS integration) """ try: - logger.info("Init: " + self._containerName + ' ; ' + self._instanceName) + logger.info("Init: " + self._getIdMessage()) DEVIATION.lock.acquire() salome.salome_init() DEVIATION.lock.release() @@ -149,7 +157,7 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen, use with OpenTURNS in SALOME 5.1.5 and later (for YACS integration) """ try: - logger.info("Exec: " + self._containerName + ' ; ' + self._instanceName) + logger.info("Exec: " + self._getIdMessage()) logger.debug("inputVarList: %s" % paramInput.inputVarList) logger.debug("outputVarList: %s" % paramInput.outputVarList) logger.debug("inputValues: %s" % paramInput.inputValues) @@ -189,7 +197,7 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen, It cleans everything set so far. """ try: - logger.info("Finalize: " + self._containerName + ' ; ' + self._instanceName) + logger.info("Finalize: " + self._getIdMessage()) except: self._raiseSalomeError() -- 2.39.2