Skip to content

[OMCSession*] Cleanup / mypy check #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adeas31 merged 12 commits into from
Jun 5, 2025
Merged

[OMCSession*] Cleanup / mypy check #291

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ec13a05
[DummyPopen] remove redundant parentheses
syntron Apr 24, 2025
0d8eb54
[OMCSession*] move logging into OMCSessionZMQ.sendExpression()
syntron Apr 29, 2025
49eb694
[OMCSessionZMQ] fix f-string
syntron May 6, 2025
b60428c
[OMCSessionZMQ] layout fix based on PyCharm warnings
syntron May 8, 2025
7124ed7
[OMCSessionZMQ] rename omhome => _omhome
syntron May 6, 2025
53dfbbf
[OMCSessionZMQ] update _create_omc_log_file()
syntron May 9, 2025
7c08a02
[OMCSessionZMQ] remove fixme - check source of this line
syntron May 9, 2025
d30bf9a
[OMCSessionZMQ] simplify _port_file
syntron May 9, 2025
15bc0ce
[OMCSessionZMQ] simplify _connect_to_omc() / _port
syntron May 9, 2025
eeccdfa
[OMCSessionZMQ] cleanup self._start_omc_process()
syntron May 9, 2025
4ce10d5
[OMCSessionZMQ] cleanup self._set_omc_command()
syntron May 28, 2025
cf937cc
[OMCSession*] fix mypy warnings
syntron May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[OMCSessionZMQ] cleanup self._start_omc_process()
  • Loading branch information
@syntron
syntron committed Jun 4, 2025
commit eeccdfa23fc8081eac8e580816db4f3f3bdcd71a
22 changes: 11 additions & 11 deletions OMPython/OMCSession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def __init__(self, timeout=10.00,
"--locale=C",
f"-z={self._random_string}"])
# start up omc executable, which is waiting for the ZMQ connection
self._start_omc_process(timeout)
self._omc_process = self._start_omc_process(timeout)
# connect to the running omc instance using ZMQ
self._omc_port = self._connect_to_omc(timeout)

Expand Down Expand Up @@ -346,19 +346,19 @@ def _create_omc_log_file(self, suffix): # output?

return omc_log_file

def _start_omc_process(self, timeout):
def _start_omc_process(self, timeout): # output?
if sys.platform == 'win32':
omhome_bin = (self._omhome / "bin").as_posix()
my_env = os.environ.copy()
my_env["PATH"] = omhome_bin + os.pathsep + my_env["PATH"]
self._omc_process = subprocess.Popen(self._omc_command, stdout=self._omc_log_file,
stderr=self._omc_log_file, env=my_env)
omc_process = subprocess.Popen(self._omc_command, stdout=self._omc_log_file,
stderr=self._omc_log_file, env=my_env)
else:
# set the user environment variable so omc running from wsgi has the same user as OMPython
my_env = os.environ.copy()
my_env["USER"] = self._currentUser
self._omc_process = subprocess.Popen(self._omc_command, stdout=self._omc_log_file,
stderr=self._omc_log_file, env=my_env)
omc_process = subprocess.Popen(self._omc_command, stdout=self._omc_log_file,
stderr=self._omc_log_file, env=my_env)
if self._docker:
for i in range(0, 40):
try:
Expand Down Expand Up @@ -387,24 +387,24 @@ def _start_omc_process(self, timeout):
if sys.platform == 'win32':
break
dockerTop = subprocess.check_output(["docker", "top", self._dockerCid]).decode().strip()
self._omc_process = None
omc_process = None
for line in dockerTop.split("\n"):
columns = line.split()
if self._random_string in line:
try:
self._omc_process = DummyPopen(int(columns[1]))
omc_process = DummyPopen(int(columns[1]))
except psutil.NoSuchProcess:
raise OMCSessionException(
f"Could not find PID {dockerTop} - is this a docker instance spawned "
f"without --pid=host?\nLog-file says:\n{open(self._omc_log_file.name).read()}")
break
if self._omc_process is not None:
if omc_process is not None:
break
time.sleep(timeout / 40.0)
if self._omc_process is None:
if omc_process is None:
raise OMCSessionException("Docker top did not contain omc process %s:\n%s\nLog-file says:\n%s"
% (self._random_string, dockerTop, open(self._omc_log_file.name).read()))
return self._omc_process
return omc_process

def _getuid(self):
"""
Expand Down