feat(herdr): complete Herdr 0.8.0 adaptation and sanitize module
This commit is contained in:
@@ -122,21 +122,10 @@ def get_job_status(s):
|
||||
|
||||
|
||||
sessions_detail = []
|
||||
def _sanitize(n):
|
||||
if len(n) <= 32:
|
||||
return n
|
||||
return f"{n[:16]}-{n[-15:]}"[:32]
|
||||
from lib_py.agents.sanitize import sanitize_herdr_agent_name as _sanitize
|
||||
|
||||
def is_alive(name, server):
|
||||
if f"{name}|{server}" in alive or f"{_sanitize(name)}|{server}" in alive:
|
||||
return True
|
||||
prefix = name[:14]
|
||||
suffix = name[-12:]
|
||||
for item in alive:
|
||||
a_name, a_srv = item.split("|", 1) if "|" in item else (item, "default")
|
||||
if a_srv == server and a_name.startswith(prefix) and a_name.endswith(suffix):
|
||||
return True
|
||||
return False
|
||||
return f"{name}|{server}" in alive or f"{_sanitize(name)}|{server}" in alive
|
||||
|
||||
for s in d.get('herdr_sessions', []):
|
||||
name = s.get('name', '?')
|
||||
@@ -235,10 +224,7 @@ def get_job_status(s):
|
||||
return (jid, 'unknown')
|
||||
|
||||
|
||||
def _sanitize(n):
|
||||
if len(n) <= 32:
|
||||
return n
|
||||
return f"{n[:16]}-{n[-15:]}"[:32]
|
||||
from lib_py.agents.sanitize import sanitize_herdr_agent_name as _sanitize
|
||||
|
||||
sessions = d.get('herdr_sessions', [])
|
||||
print(f"agent-sessions status — {drift['timestamp']} (herdr_confirmed={drift['herdr_confirmed']})")
|
||||
@@ -248,15 +234,7 @@ print("-" * 136)
|
||||
if not sessions:
|
||||
print("(no sessions registered)")
|
||||
def is_alive(name, server):
|
||||
if f"{name}|{server}" in alive or f"{_sanitize(name)}|{server}" in alive:
|
||||
return True
|
||||
prefix = name[:14]
|
||||
suffix = name[-12:]
|
||||
for item in alive:
|
||||
a_name, a_srv = item.split("|", 1) if "|" in item else (item, "default")
|
||||
if a_srv == server and a_name.startswith(prefix) and a_name.endswith(suffix):
|
||||
return True
|
||||
return False
|
||||
return f"{name}|{server}" in alive or f"{_sanitize(name)}|{server}" in alive
|
||||
|
||||
for s in sessions:
|
||||
name = s.get('name', '?')
|
||||
|
||||
Reference in New Issue
Block a user