BIND 10 trac2172, updated. 1bb96c51fe720e5ef8466aa0b2eb1619bd949204 [2172] use 3-tuple instead of fixed-size list for loadavg
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Aug 9 14:24:51 UTC 2012
The branch, trac2172 has been updated
via 1bb96c51fe720e5ef8466aa0b2eb1619bd949204 (commit)
from 3fc727f1addbcbab236ffa9f27cab70427fa2205 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1bb96c51fe720e5ef8466aa0b2eb1619bd949204
Author: Jelte Jansen <jelte at isc.org>
Date: Thu Aug 9 16:24:18 2012 +0200
[2172] use 3-tuple instead of fixed-size list for loadavg
-----------------------------------------------------------------------
Summary of changes:
src/bin/sysinfo/sysinfo.py.in | 3 +--
src/lib/python/isc/sysinfo/sysinfo.py | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/sysinfo/sysinfo.py.in b/src/bin/sysinfo/sysinfo.py.in
index 1de2a78..24cf309 100755
--- a/src/bin/sysinfo/sysinfo.py.in
+++ b/src/bin/sysinfo/sysinfo.py.in
@@ -90,8 +90,7 @@ def main():
write_value(f, ' + Hostname: %s\n', s.get_platform_hostname)
write_value(f, ' + Uptime: %d seconds\n', s.get_uptime)
- l = s.get_loadavg()
- f.write(' + Loadavg: %f %f %f\n' % (l[0], l[1], l[2]))
+ write_value(f, ' + Loadavg: %f %f %f\n', s.get_loadavg)
f.write('\nMemory\n');
write_value(f, ' + Total: %d bytes\n', s.get_mem_total)
diff --git a/src/lib/python/isc/sysinfo/sysinfo.py b/src/lib/python/isc/sysinfo/sysinfo.py
index 24b9223..c323814 100644
--- a/src/lib/python/isc/sysinfo/sysinfo.py
+++ b/src/lib/python/isc/sysinfo/sysinfo.py
@@ -164,7 +164,7 @@ class SysInfoLinux(SysInfoPOSIX):
with open('/proc/loadavg') as f:
l = f.read().strip().split(' ')
if len(l) >= 3:
- self._loadavg = [float(l[0]), float(l[1]), float(l[2])]
+ self._loadavg = (float(l[0]), float(l[1]), float(l[2]))
with open('/proc/meminfo') as f:
m = f.readlines()
@@ -315,7 +315,7 @@ class SysInfoOpenBSD(SysInfoBSD):
s = subprocess.check_output(['sysctl', '-n', 'vm.loadavg'])
l = s.decode('utf-8').strip().split(' ')
if len(l) >= 3:
- self._loadavg = [float(l[0]), float(l[1]), float(l[2])]
+ self._loadavg = (float(l[0]), float(l[1]), float(l[2]))
except (subprocess.CalledProcessError, OSError):
pass
@@ -370,7 +370,7 @@ class SysInfoFreeBSDOSX(SysInfoBSD):
else:
la = l.split(' ')
if len(la) >= 3:
- self._loadavg = [float(la[0]), float(la[1]), float(la[2])]
+ self._loadavg = (float(la[0]), float(la[1]), float(la[2]))
except (subprocess.CalledProcessError, OSError):
pass
More information about the bind10-changes
mailing list