提交 e8ccb644 编写于 作者: A Alessio Sergi

Some minor fixes and misspelling

上级 904e0f1f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
############################################################################## ##############################################################################
[global] [global]
# Does Glances should check if a newer version is available on Pypi ? # Does Glances should check if a newer version is available on PyPI ?
check_update=true check_update=true
# History size (maximum number of values) # History size (maximum number of values)
# Default is 28800: 1 day with 1 point every 3 seconds (default refresh time) # Default is 28800: 1 day with 1 point every 3 seconds (default refresh time)
...@@ -48,12 +48,12 @@ steal_warning=70 ...@@ -48,12 +48,12 @@ steal_warning=70
steal_critical=90 steal_critical=90
#steal_log=True #steal_log=True
# I/O wait percentage should be lower than 1/# (of CPU cores) # I/O wait percentage should be lower than 1/# (of CPU cores)
# Let commented for default config (1/#-20% / 1/#-10% / 1/#) # Leave commented to just use the default config (1/#-20% / 1/#-10% / 1/#)
#iowait_careful=30 #iowait_careful=30
#iowait_warning=40 #iowait_warning=40
#iowait_critical=50 #iowait_critical=50
# Context switch limit (core / second) # Context switch limit (core / second)
# Let commented for default config (critical is 56000/# (of CPU core)) # Leave commented to just use the default config (critical is 56000/# (of CPU core))
#ctx_switches_careful=10000 #ctx_switches_careful=10000
#ctx_switches_warning=12000 #ctx_switches_warning=12000
#ctx_switches_critical=14000 #ctx_switches_critical=14000
...@@ -211,7 +211,7 @@ mem_critical=90 ...@@ -211,7 +211,7 @@ mem_critical=90
# Ports scanner plugin configuration # Ports scanner plugin configuration
# Interval in second between two scans # Interval in second between two scans
refresh=30 refresh=30
# Set the default timeout (in second) for a scan (can be overwrite in the scan list) # Set the default timeout (in second) for a scan (can be overwritten in the scan list)
timeout=3 timeout=3
# If port_default_gateway is True, add the default gateway on top of the scan list # If port_default_gateway is True, add the default gateway on top of the scan list
port_default_gateway=True port_default_gateway=True
...@@ -365,7 +365,7 @@ prefix=G ...@@ -365,7 +365,7 @@ prefix=G
# * regex: Regular expression to filter the process(es) # * regex: Regular expression to filter the process(es)
# * refresh: The AMP is executed every refresh seconds # * refresh: The AMP is executed every refresh seconds
# * one_line: (optional) Force (if true) the AMP to be displayed in one line # * one_line: (optional) Force (if true) the AMP to be displayed in one line
* * command: (optional) command to execute when the process is detected (thk to the regex) # * command: (optional) command to execute when the process is detected (thk to the regex)
# * countmin: (optional) minimal number of processes # * countmin: (optional) minimal number of processes
# A warning will be displayed if number of process < count # A warning will be displayed if number of process < count
# * countmax: (optional) maximum number of processes # * countmax: (optional) maximum number of processes
......
...@@ -775,12 +775,11 @@ class _GlancesCurses(object): ...@@ -775,12 +775,11 @@ class _GlancesCurses(object):
# Only in standalone mode (cs_status is None) # Only in standalone mode (cs_status is None)
if self.edit_filter and cs_status is None: if self.edit_filter and cs_status is None:
new_filter = self.display_popup( new_filter = self.display_popup(
'Process filter pattern: \n' + 'Process filter pattern: \n\n' +
'\n' +
'Examples:\n' + 'Examples:\n' +
'- python\n' + '- python\n' +
'- .*python.*\n' + '- .*python.*\n' +
'- \/usr\/lib.*' + '- \/usr\/lib.*\n' +
'- name:.*nautilus.*\n' + '- name:.*nautilus.*\n' +
'- cmdline:.*glances.*\n' + '- cmdline:.*glances.*\n' +
'- username:nicolargo\n' + '- username:nicolargo\n' +
...@@ -788,7 +787,7 @@ class _GlancesCurses(object): ...@@ -788,7 +787,7 @@ class _GlancesCurses(object):
is_input=True, is_input=True,
input_value=glances_processes.process_filter_input) input_value=glances_processes.process_filter_input)
glances_processes.process_filter = new_filter glances_processes.process_filter = new_filter
elif self.edit_filter and cs_status != 'None': elif self.edit_filter and cs_status is not None:
self.display_popup('Process filter only available in standalone mode') self.display_popup('Process filter only available in standalone mode')
self.edit_filter = False self.edit_filter = False
......
...@@ -30,7 +30,7 @@ import psutil ...@@ -30,7 +30,7 @@ import psutil
try: try:
from wifi.scan import Cell from wifi.scan import Cell
from wifi.exceptions import InterfaceError from wifi.exceptions import InterfaceError
except ImportError as e: except ImportError:
logger.debug("Wifi library not found. Glances cannot grab Wifi info.") logger.debug("Wifi library not found. Glances cannot grab Wifi info.")
wifi_tag = False wifi_tag = False
else: else:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册