From fb3368abc8da5f9bb71283b7afb29e2c0237a402 Mon Sep 17 00:00:00 2001 From: DUC ANH HOANG Date: Wed, 20 Mar 2024 14:21:45 +0100 Subject: [PATCH] append some logs for GetCommandFromTemplate --- src/Container/SALOME_ContainerManager.cxx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index 66cd8fd09..20776769f 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -971,18 +971,17 @@ std::string GetCommandFromTemplate(const std::string& theScriptName, // manage GIL PyObject* mod(PyImport_ImportModule(theScriptName.c_str())); + MESSAGE("Template name :"<< theScriptName.c_str()); + if (!mod) { - PyObject* sys = PyImport_ImportModule("sys"); - PyObject* sys_path = PyObject_GetAttrString(sys, "path"); - PyObject* folder_path = PyUnicode_FromString(getScriptTemplateFilePath().c_str()); + AutoPyRef sys = PyImport_ImportModule("sys"); + AutoPyRef sys_path = PyObject_GetAttrString(sys, "path"); + AutoPyRef folder_path = PyUnicode_FromString(getScriptTemplateFilePath().c_str()); PyList_Append(sys_path, folder_path); mod = PyImport_ImportModule(theScriptName.c_str()); - Py_XDECREF(folder_path); - Py_XDECREF(sys_path); - Py_XDECREF(sys); } if (mod) @@ -1027,6 +1026,10 @@ std::string GetCommandFromTemplate(const std::string& theScriptName, Py_XDECREF(mod); } } + else + { + ERROR_MESSAGE("Can not import the template script \"" << theScriptName << "\" !"); + } MESSAGE("Command from template is ... " << command << std::endl); return command; @@ -1104,6 +1107,7 @@ std::string SALOME_ContainerManager::BuildCommandToLaunchLocalContainer(const En std::string ompi_uri_file = GetenvThreadSafeAsString("OMPI_URI_FILE"); script_parameters.push(ompi_uri_file.empty() ? "NULL" : ompi_uri_file); + MESSAGE("Retrieving command from template (python module) \"" << script_name << "\"" << std::endl); std::string command_from_template = GetCommandFromTemplate(script_name, script_parameters); std::ostringstream o; -- 2.39.2