Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
3fc727f1
Commit
3fc727f1
authored
Aug 09, 2012
by
Jelte Jansen
Browse files
[2172] generalize only-write-value-if-known
parent
7520a683
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/sysinfo/sysinfo.py.in
View file @
3fc727f1
...
...
@@ -32,6 +32,15 @@ def usage():
file=sys.stderr)
exit(1)
def write_value(out, fmt, call):
'''Helper function for standard value writing.
Writes the result from the call in the given format to out.
Does not write anything if the result of the call is None.
'''
value = call()
if value is not None:
out.write(fmt % value)
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "o:h", \
...
...
@@ -61,13 +70,13 @@ def main():
f.write('================\n')
f.write('\nCPU\n');
f.
write
(
' + Number of processors: %d\n'
% (
s.get_num_processors
())
)
f.
write
(
' + Endianness: %s\n'
% (
s.get_endianness
())
)
write
_value(f,
' + Number of processors: %d\n'
,
s.get_num_processors)
write
_value(f,
' + Endianness: %s\n'
,
s.get_endianness)
f.write('\nPlatform\n');
f.
write
(
' + Operating system: %s\n'
% (
s.get_platform_name
())
)
f.
write
(
' + Distribution: %s\n'
% (
s.get_platform_distro
())
)
f.
write
(
' + Kernel version: %s\n'
% (
s.get_platform_version
())
)
write
_value(f,
' + Operating system: %s\n'
,
s.get_platform_name)
write
_value(f,
' + Distribution: %s\n'
,
s.get_platform_distro)
write
_value(f,
' + Kernel version: %s\n'
,
s.get_platform_version)
if s.get_platform_is_smp() is not None:
f.write(' + SMP kernel: ')
...
...
@@ -77,22 +86,20 @@ def main():
f.write('no')
f.write('\n')
f.
write
(
' + Machine name: %s\n'
% (
s.get_platform_machine
())
)
f.
write
(
' + Hostname: %s\n'
% (
s.get_platform_hostname
())
)
f.
write
(
' + Uptime: %d seconds\n'
% (
s.get_uptime
())
)
write
_value(f,
' + Machine name: %s\n'
,
s.get_platform_machine)
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]))
f.write('\nMemory\n');
f.write(' + Total: %d bytes\n' % (s.get_mem_total()))
f.write(' + Free: %d bytes\n' % (s.get_mem_free()))
if s.get_mem_cached() is not None:
f.write(' + Cached: %d bytes\n' % (s.get_mem_cached()))
if s.get_mem_buffers() is not None:
f.write(' + Buffers: %d bytes\n' % (s.get_mem_buffers()))
f.write(' + Swap total: %d bytes\n' % (s.get_mem_swap_total()))
f.write(' + Swap free: %d bytes\n' % (s.get_mem_swap_free()))
write_value(f, ' + Total: %d bytes\n', s.get_mem_total)
write_value(f, ' + Free: %d bytes\n', s.get_mem_free)
write_value(f, ' + Cached: %d bytes\n', s.get_mem_cached)
write_value(f, ' + Buffers: %d bytes\n', s.get_mem_buffers)
write_value(f, ' + Swap total: %d bytes\n', s.get_mem_swap_total)
write_value(f, ' + Swap free: %d bytes\n', s.get_mem_swap_free)
f.write('\n\nNetwork\n');
f.write('-------\n\n');
...
...
@@ -100,19 +107,19 @@ def main():
f.write('Interfaces\n')
f.write('~~~~~~~~~~\n\n')
f.
write
(
s.get_net_interfaces
()
)
write
_value(f, '%s',
s.get_net_interfaces)
f.write('\nRouting table\n')
f.write('~~~~~~~~~~~~~\n\n')
f.
write
(
s.get_net_routing_table
()
)
write
_value(f, '%s',
s.get_net_routing_table)
f.write('\nStatistics\n')
f.write('~~~~~~~~~~\n\n')
f.
write
(
s.get_net_stats
()
)
write
_value(f, '%s',
s.get_net_stats)
f.write('\nConnections\n')
f.write('~~~~~~~~~~~\n\n')
f.
write
(
s.get_net_connections
()
)
write
_value(f, '%s',
s.get_net_connections)
try:
if os.getuid() != 0:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment