fix(issue-57): the audit log follows the registry; the disk fallback reads the audit status #58
@@ -167,6 +167,10 @@ def get_job_status(s):
|
|||||||
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
||||||
candidates += [os.path.join(r, jid, 'status.json')
|
candidates += [os.path.join(r, jid, 'status.json')
|
||||||
for r in (os.environ.get('DELEGATE_JOB_LOGS_DIR'), cp.get('delegate_job_logs_dir')) if r]
|
for r in (os.environ.get('DELEGATE_JOB_LOGS_DIR'), cp.get('delegate_job_logs_dir')) if r]
|
||||||
|
# Issue #57: the audit log lives next to the registry unless moved explicitly
|
||||||
|
from lib_py.delegation.mqtt_common import sibling_logs_dir
|
||||||
|
candidates += [os.path.join(sibling_logs_dir(r), jid, 'status.json')
|
||||||
|
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
||||||
candidates += [
|
candidates += [
|
||||||
os.path.join('.mam', 'jobs', f"{jid}.json"),
|
os.path.join('.mam', 'jobs', f"{jid}.json"),
|
||||||
os.path.join(project_root, '.mam', 'jobs', f"{jid}.json"),
|
os.path.join(project_root, '.mam', 'jobs', f"{jid}.json"),
|
||||||
@@ -375,6 +379,10 @@ def get_job_status(s):
|
|||||||
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
||||||
candidates += [os.path.join(r, jid, 'status.json')
|
candidates += [os.path.join(r, jid, 'status.json')
|
||||||
for r in (os.environ.get('DELEGATE_JOB_LOGS_DIR'), cp.get('delegate_job_logs_dir')) if r]
|
for r in (os.environ.get('DELEGATE_JOB_LOGS_DIR'), cp.get('delegate_job_logs_dir')) if r]
|
||||||
|
# Issue #57: the audit log lives next to the registry unless moved explicitly
|
||||||
|
from lib_py.delegation.mqtt_common import sibling_logs_dir
|
||||||
|
candidates += [os.path.join(sibling_logs_dir(r), jid, 'status.json')
|
||||||
|
for r in (os.environ.get('MAM_JOBS_DIR'), cp.get('mam_jobs_dir')) if r]
|
||||||
candidates += [
|
candidates += [
|
||||||
os.path.join('.mam', 'jobs', f"{jid}.json"),
|
os.path.join('.mam', 'jobs', f"{jid}.json"),
|
||||||
os.path.join(project_root, '.mam', 'jobs', f"{jid}.json"),
|
os.path.join(project_root, '.mam', 'jobs', f"{jid}.json"),
|
||||||
|
|||||||
Reference in new issue
Block a user