nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-29 04:04:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #435 from desbma/develop

Browse Source 
Minor cosmetic fixes

Merci pour la contrib ;)
This commit is contained in:
Nicolas Hennion 2014-10-30 13:29:47 +01:00
commit 905931bf8c
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/glances-doc.rst
View File

@ -285,14 +285,14 @@ On OS X, you should copy the configuration file to
Logs and debug mode Logs and debug mode
=================== ===================
Glances logs all its internal messages to a log file. By default, only Glances logs all its internal messages to a log file. By default, only
INFO & WARNING & ERROR &CRITICAL levels are logged, but DEBUG messages INFO & WARNING & ERROR &CRITICAL levels are logged, but DEBUG messages
can ben logged using the -d option on the command line. can ben logged using the -d option on the command line.
By default, the configuration file is under: By default, the log file is under:
:Linux, \*BSD and OS X: ``/tmp/glances.conf`` :Linux, \*BSD and OS X: ``/tmp/glances.log``
:Windows: ``%APPDATA%\Local\temp\glances.conf`` :Windows: ``%APPDATA%\Local\temp\glances.log``
Anatomy Of The Application Anatomy Of The Application
========================== ==========================
@ -414,7 +414,7 @@ Alerts are only set if the maximum speed per network interface is available
*Note*: it is possibile to define a list of network interfaces to hide *Note*: it is possibile to define a list of network interfaces to hide
and per-interface limit values in the ``[network]`` section of the and per-interface limit values in the ``[network]`` section of the
configuration file and aliases for interface name. configuration file and aliases for interface name.
Disk I/O Disk I/O
-------- --------
@ -461,7 +461,7 @@ temperature only.
There is no alert on this information. There is no alert on this information.
*Note*: limit values and sensors alias names can be defined in the configuration *Note*: limit values and sensors alias names can be defined in the configuration
file under the ``[sensors]`` section. file under the ``[sensors]`` section.
Processes List Processes List
@ -524,7 +524,7 @@ The number of processes in the list is adapted to the screen size.
Per process I/O write rate (in Byte/s) Per process I/O write rate (in Byte/s)
``COMMAND`` ``COMMAND``
Process command line Process command line
User cans switch to the process name by pressing on the ``/`` key User cans switch to the process name by pressing on the ``/`` key
Process status legend: Process status legend:
@ -546,7 +546,7 @@ In standalone mode, additionals informations are provided for the top process:
* CPU affinity (number of cores used by the process) * CPU affinity (number of cores used by the process)
* Extended memory information (swap, shared, text, lib, data and dirty on Linux) * Extended memory information (swap, shared, text, lib, data and dirty on Linux)
* Openned threads, files and network sessions (TCP and UDP) * Openned threads, files and network sessions (TCP and UDP)
* IO nice level * IO nice level
The extended stats feature could be enabled using the --enable-process-extended option (command line) or the ``e`` key (curses interface). The extended stats feature could be enabled using the --enable-process-extended option (command line) or the ``e`` key (curses interface).
@ -674,4 +674,4 @@ Feel free to contribute !
.. _psutil: https://code.google.com/p/psutil/ .. _psutil: https://code.google.com/p/psutil/
.. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html .. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html
.. _RESTFULL-JSON: http://jsonapi.org/ .. _RESTFULL-JSON: http://jsonapi.org/
.. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users .. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users

16
glances/plugins/glances_processlist.py
View File

@ -57,7 +57,7 @@ class Plugin(GlancesPlugin):
# Update stats using the standard system lib # Update stats using the standard system lib
# Note: Update is done in the processcount plugin # Note: Update is done in the processcount plugin
# Just return the processes list # Just return the processes list
self.stats = glances_processes.getlist() self.stats = glances_processes.getlist()
elif self.get_input() == 'snmp': elif self.get_input() == 'snmp':
# No SNMP grab for processes # No SNMP grab for processes
pass pass
@ -260,7 +260,7 @@ class Plugin(GlancesPlugin):
if 'memory_swap' in p and p['memory_swap'] is not None: if 'memory_swap' in p and p['memory_swap'] is not None:
msg += _('swap ') + self.auto_unit(p['memory_swap'], low_precision=False) msg += _('swap ') + self.auto_unit(p['memory_swap'], low_precision=False)
ret.append(self.curse_add_line(msg, splittable=True)) ret.append(self.curse_add_line(msg, splittable=True))
# Third line is for openned files/network sessions # Third line is for open files/network sessions
msg = '' msg = ''
if 'num_threads' in p and p['num_threads'] is not None: if 'num_threads' in p and p['num_threads'] is not None:
msg += _('threads ') + str(p['num_threads']) + ' ' msg += _('threads ') + str(p['num_threads']) + ' '
@ -274,7 +274,7 @@ class Plugin(GlancesPlugin):
msg += _('UDP ') + str(p['udp']) + ' ' msg += _('UDP ') + str(p['udp']) + ' '
if msg != '': if msg != '':
ret.append(self.curse_new_line()) ret.append(self.curse_new_line())
msg = xpad + _('Openned: ') + msg msg = xpad + _('Open: ') + msg
ret.append(self.curse_add_line(msg, splittable=True)) ret.append(self.curse_add_line(msg, splittable=True))
# Fouth line is IO nice level (only Linux and Windows OS) # Fouth line is IO nice level (only Linux and Windows OS)
if 'ionice' in p and p['ionice'] is not None: if 'ionice' in p and p['ionice'] is not None:
@ -282,8 +282,8 @@ class Plugin(GlancesPlugin):
msg = xpad + _('IO nice: ') msg = xpad + _('IO nice: ')
k = _('Class is ') k = _('Class is ')
v = p['ionice'].ioclass v = p['ionice'].ioclass
# Linux: The scheduling class. 0 for none, 1 for real time, 2 for best-effort, 3 for idle. # Linux: The scheduling class. 0 for none, 1 for real time, 2 for best-effort, 3 for idle.
# Windows: On Windows only ioclass is used and it can be set to 2 (normal), 1 (low) or 0 (very low). # Windows: On Windows only ioclass is used and it can be set to 2 (normal), 1 (low) or 0 (very low).
if is_windows: if is_windows:
if v == 0: if v == 0:
msg += k + 'Very Low' msg += k + 'Very Low'
@ -292,7 +292,7 @@ class Plugin(GlancesPlugin):
elif v == 2: elif v == 2:
msg += _('No specific I/O priority') msg += _('No specific I/O priority')
else: else:
msg += k + str(v) msg += k + str(v)
else: else:
if v == 0: if v == 0:
msg += _('No specific I/O priority') msg += _('No specific I/O priority')
@ -304,11 +304,11 @@ class Plugin(GlancesPlugin):
msg += k + 'IDLE' msg += k + 'IDLE'
else: else:
msg += k + str(v) msg += k + str(v)
# value is a number which goes from 0 to 7. # value is a number which goes from 0 to 7.
# The higher the value, the lower the I/O priority of the process. # The higher the value, the lower the I/O priority of the process.
if hasattr(p['ionice'], 'value') and p['ionice'].value != 0: if hasattr(p['ionice'], 'value') and p['ionice'].value != 0:
msg += _(' (value %s/7)') % str(p['ionice'].value) msg += _(' (value %s/7)') % str(p['ionice'].value)
ret.append(self.curse_add_line(msg, splittable=True)) ret.append(self.curse_add_line(msg, splittable=True))
# End of extended stats # End of extended stats
first = False first = False