Skip to content

Commit 981f69a

Browse files
committed
[OMCSession] store the filename of the log file and print it in exception messages
1 parent f4ffc53 commit 981f69a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

OMPython/OMCSession.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -664,12 +664,12 @@ def __init__(
664664
self._omc_zmq: Optional[zmq.Socket[bytes]] = None
665665

666666
# setup log file - this file must be closed in the destructor
667-
logfile = self._temp_dir / (self._omc_filebase + ".log")
667+
self._omc_logfile = self._temp_dir / (self._omc_filebase + ".log")
668668
self._omc_loghandle: Optional[io.TextIOWrapper] = None
669669
try:
670-
self._omc_loghandle = open(file=logfile, mode="w+", encoding="utf-8")
670+
self._omc_loghandle = open(file=self._omc_logfile, mode="w+", encoding="utf-8")
671671
except OSError as ex:
672-
raise OMCSessionException(f"Cannot open log file {logfile}.") from ex
672+
raise OMCSessionException(f"Cannot open log file {self._omc_logfile}.") from ex
673673

674674
# variables to store compiled re expressions use in self.sendExpression()
675675
self._re_log_entries: Optional[re.Pattern[str]] = None
@@ -1146,8 +1146,9 @@ def _omc_port_get(self) -> str:
11461146
if port is not None:
11471147
break
11481148
else:
1149-
logger.error(f"Docker did not start. Log-file says:\n{self.get_log()}")
1150-
raise OMCSessionException(f"OMC Server did not start (timeout={self._timeout}).")
1149+
logger.error(f"OMC server did not start. Log-file says:\n{self.get_log()}")
1150+
raise OMCSessionException(f"OMC Server did not start (timeout={self._timeout}, "
1151+
f"logfile={repr(self._omc_logfile)}).")
11511152

11521153
logger.info(f"Local OMC Server is up and running at ZMQ port {port} "
11531154
f"pid={self._omc_process.pid if isinstance(self._omc_process, subprocess.Popen) else '?'}")
@@ -1282,7 +1283,8 @@ def _omc_port_get(self) -> str:
12821283
break
12831284
else:
12841285
logger.error(f"Docker did not start. Log-file says:\n{self.get_log()}")
1285-
raise OMCSessionException(f"Docker based OMC Server did not start (timeout={self._timeout}).")
1286+
raise OMCSessionException(f"Docker based OMC Server did not start (timeout={self._timeout}, "
1287+
f"logfile={repr(self._omc_logfile)}).")
12861288

12871289
logger.info(f"Docker based OMC Server is up and running at port {port}")
12881290

0 commit comments

Comments
 (0)