Do not start status report on platform without AF_UNIX socket

issue11319
review393871002
(grafted from f9c934230c6b1f7d8c5ee4a3722227ced19393ae)

--HG--
branch : 6.0
This commit is contained in:
Cédric Krier committed 2022-04-01 23:48:06 +02:00
1 parent a7e39de86a
commit 289bd14bbf
2 files changed
+10 -2

No files matched your search

+3 -2
View File
@@ -125,7 +125,8 @@ def main(stdscr):
processes[pid] = data
refresh()
refresh()
status.listen(config.get('database', 'path'), update)
return status.listen(config.get('database', 'path'), update)
curses.wrapper(main)
if not curses.wrapper(main):
sys.stderr.write("status not supported on this platform\n")
+7
View File
@@ -48,6 +48,8 @@ def log():
def dump(path):
if not hasattr(socket, 'AF_UNIX'):
return False
sock = socket.socket(socket.AF_UNIX)
try:
try:
@@ -73,6 +75,8 @@ def dumper(path):
def start(path):
global _PID, _PATH
if not hasattr(socket, 'AF_UNIX'):
return
if _PID != os.getpid() and path: # Quick test without lock
with _LOCK:
if _PID != os.getpid():
@@ -83,6 +87,8 @@ def start(path):
def listen(path, callback=None):
if not hasattr(socket, 'AF_UNIX'):
return False
sock = socket.socket(socket.AF_UNIX)
socket_file = os.path.join(path, address)
try:
@@ -115,3 +121,4 @@ def listen(path, callback=None):
finally:
sock.close()
os.unlink(socket_file)
return True