Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-25 15:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Also guard /proc/self/fds-related code with a suitable psuedoconstant

Browse Source
This commit is contained in:
Paul "LeoNerd" Evans 2016-10-19 15:37:41 +01:00
parent 1b179455fc
commit b202531be6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/metrics/__init__.py
View File

@ -118,6 +118,7 @@ BYTES_PER_PAGE = 4096
HAVE_PROC_STAT = os.path.exists("/proc/stat") HAVE_PROC_STAT = os.path.exists("/proc/stat")
HAVE_PROC_SELF_STAT = os.path.exists("/proc/self/stat") HAVE_PROC_SELF_STAT = os.path.exists("/proc/self/stat")
HAVE_PROC_SELF_LIMITS = os.path.exists("/proc/self/limits") HAVE_PROC_SELF_LIMITS = os.path.exists("/proc/self/limits")
HAVE_PROC_SELF_FDS = os.path.exists("/proc/self/fds")
rusage = None rusage = None
stats = None stats = None
@ -162,7 +163,7 @@ def _process_fds():
counts[("other",)] = 0 counts[("other",)] = 0
# Not every OS will have a /proc/self/fd directory # Not every OS will have a /proc/self/fd directory
if not os.path.exists("/proc/self/fd"): if not HAVE_PROC_SELF_FDS:
return counts return counts
for fd in os.listdir("/proc/self/fd"): for fd in os.listdir("/proc/self/fd"):
@ -217,11 +218,12 @@ if HAVE_PROC_SELF_STAT:
) )
process_metrics.register_callback( process_metrics.register_callback(
"open_fds", lambda: sum(fd_counts.values()) "start_time_seconds", lambda: boot_time + int(stats[19]) / TICKS_PER_SEC
) )
if HAVE_PROC_SELF_FDS:
process_metrics.register_callback( process_metrics.register_callback(
"start_time_seconds", lambda: boot_time + int(stats[19]) / TICKS_PER_SEC "open_fds", lambda: sum(fd_counts.values())
) )
if HAVE_PROC_SELF_LIMITS: if HAVE_PROC_SELF_LIMITS: