Skip to content

code cleanup #192

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
corrodis merged 9 commits into from
Mar 6, 2026
Merged

code cleanup #192

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d8a9100
code cleanup
corrodis Feb 27, 2026
4fbca07
Merge remote-tracking branch 'origin/develop' into sc/codeCleanUp
corrodis Feb 27, 2026
9d79780
ots_whitespace_cleanup.sh
corrodis Feb 27, 2026
596a236
run py-black to pass integration test
corrodis Feb 27, 2026
f2f26a5
Initial plan
Copilot Feb 27, 2026
9762b6c
Use proctype loop variable instead of proctypes[i_p] in enumerate loop
Copilot Feb 27, 2026
8560c1d
Merge pull request #193 from art-daq/copilot/sub-pr-192
eflumerf Feb 27, 2026
24ee809
addressed PR feedback
corrodis Mar 5, 2026
3f7cfac
Merge remote-tracking branch 'origin/sc/codeCleanUp' into sc/codeCleanUp
corrodis Mar 5, 2026
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
84 changes: 54 additions & 30 deletions rc/control/daqinterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import traceback
import re
import string
import shlex
import glob
import stat
from threading import RLock
Expand Down Expand Up @@ -1794,6 +1795,7 @@ def get_artdaq_log_filenames(self):
]
cmds = []
proctypes = []
proclabels = []

cmds.append('short_hostname=$( hostname | sed -r "s/([^.]+).*/\\1/" )')
for i_p, procinfo in enumerate(procinfos_for_host):
Expand All @@ -1816,37 +1818,52 @@ def get_artdaq_log_filenames(self):
'if (( $( echo "$timestamp_%s < %f" | bc -l ) )); then echo Most recent logfile found in expected output directory for process %s on %s, $filename_%s, is too old to be the logfile for the process in this run >&2 ; exit 1; fi'
% (i_p, self.launch_procs_time, procinfo.label, procinfo.host, i_p)
)
cmds.append(
"echo Logfile for process %s on %s is $filename_%s"
% (procinfo.label, procinfo.host, i_p)
)
cmds.append("echo __DAQLOG__%s__ $filename_%s" % (i_p, i_p))
Copy link
Contributor

@eflumerf eflumerf Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This message appears to be much less informative...is there a reason for this?

Copy link
Contributor Author

@corrodis corrodis Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point!

Copy link
Contributor Author

@corrodis corrodis Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this is used for parsing to then match the correct logfile (that led to issues before). The key is to map the logfile to the i_p, this is what this is used for. The label and host are already known by artdaq-daqinterface. I added a log entry that combines all this (but not here).

Copy link
Contributor

@rrivera747 rrivera747 Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eflumerf are you happy with this?

proctypes.append(procinfo.name)
proclabels.append(procinfo.label)

cmd = "; ".join(cmds)

if not host_is_local(host):
cmd = "ssh -o BatchMode=yes -f " + host + " '" + cmd + "'"

num_logfile_checks = 0
max_num_logfile_checks = 5

while True:

num_logfile_checks += 1

proc = Popen(
cmd,
executable="/bin/bash",
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
encoding="utf-8",
)
out, err = proc.communicate()
proclines = out.strip().split("\n")
proclines = [line for line in proclines if re.search(r"\.log$", line)]
if host_is_local(host):
proc = subprocess.run(
["/bin/bash", "-lc", cmd],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
encoding="utf-8",
)
else:
proc = subprocess.run(
[
"ssh",
"-o",
"BatchMode=yes",
host,
"/bin/bash",
"-lc",
shlex.quote(cmd),
],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
encoding="utf-8",
)

out, err = proc.stdout, proc.stderr

parsed_logfiles = []
for line in out.splitlines():
line = line.strip()
match = re.match(r"^__DAQLOG__\d+__\s+(.+)$", line)
if match:
parsed_logfiles.append(match.group(1).strip())

if len(proclines) == len(proctypes):
if proc.returncode == 0 and len(parsed_logfiles) == len(proctypes):
break # Success
else:
if num_logfile_checks == max_num_logfile_checks:
Expand Down Expand Up @@ -1874,45 +1891,52 @@ def get_artdaq_log_filenames(self):
2
) # Give the logfiles a bit of time to appear before the next check

for i_p in range(len(proclines)):
if "BoardReader" in proctypes[i_p]:
for i_p, proctype in enumerate(proctypes):
logfile = parsed_logfiles[i_p]
self.print_log(
"d",
"Logfile association: host=%s component=%s label=%s logfile=%s"
% (full_hostname, proctype, proclabels[i_p], logfile),
2,
)
if "BoardReader" in proctype:
self.boardreader_log_filenames.append(
"%s:%s"
% (
full_hostname,
proclines[i_p].strip().split()[-1],
logfile,
)
)
elif "EventBuilder" in proctypes[i_p]:
elif "EventBuilder" in proctype:
self.eventbuilder_log_filenames.append(
"%s:%s"
% (
full_hostname,
proclines[i_p].strip().split()[-1],
logfile,
)
)
elif "DataLogger" in proctypes[i_p]:
elif "DataLogger" in proctype:
self.datalogger_log_filenames.append(
"%s:%s"
% (
full_hostname,
proclines[i_p].strip().split()[-1],
logfile,
)
)
elif "Dispatcher" in proctypes[i_p]:
elif "Dispatcher" in proctype:
self.dispatcher_log_filenames.append(
"%s:%s"
% (
full_hostname,
proclines[i_p].strip().split()[-1],
logfile,
)
)
elif "RoutingManager" in proctypes[i_p]:
elif "RoutingManager" in proctype:
self.routingmanager_log_filenames.append(
"%s:%s"
% (
full_hostname,
proclines[i_p].strip().split()[-1],
logfile,
)
)
else:
Expand Down