Merge branch 'release/v2.0.1'v2.0.1

8 files changed, 69 insertions, 27 deletions

diff --git a/NEWS b/NEWS
index e71f384d..a1b276ba 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,21 @@
 Glances Version 2.x
 ==============================================================================
 
+Version 2.0.1
+=============
+
+Maintenance version.
+
+Bugs corrected:
+
+    * Error when displaying numeric process user names (#380)
+    * Display users without username correctly (#379)
+    * Bug when parsing configuration file (#378)
+    * The sda2 partition is not seen by glances (#376)
+    * Client crash if server is ended during XML request (#375)
+    * Error with the Sensors module on Debian/Ubuntu (#373)
+    * Windows don't view all processes (#319) 
+
 Version 2.0
 ===========
 
diff --git a/conf/glances-monitor.conf b/conf/glances-test.conf
index 0d901739..450e6810 100644
--- a/conf/glances-monitor.conf
+++ b/conf/glances-test.conf
@@ -48,20 +48,20 @@ careful=50
 warning=70
 critical=90
 
-# [network]
+[network]
 # Define the list of hidden network interfaces (comma separeted)
-# hide=lo
+hide=lo
 # Default limits (in bits per second aka bps) for interface bitrate
-# wlan0_rx_careful=4000000
-# wlan0_rx_warning=5000000
-# wlan0_rx_critical=6000000
-# wlan0_tx_careful=700000
-# wlan0_tx_warning=900000
-# wlan0_tx_critical=1000000
+wlan0_rx_careful=4000000
+wlan0_rx_warning=5000000
+wlan0_rx_critical=6000000
+wlan0_tx_careful=700000
+wlan0_tx_warning=900000
+wlan0_tx_critical=1000000
 
-# [diskio]
+[diskio]
 # Define the list of hidden disks (comma separeted)
-# hide=sda2,sda5
+hide=sda2,sda5
 
 [fs]
 # Default limits for free filesytem space in %
diff --git a/conf/glances.conf b/conf/glances.conf
index 2b844c99..81155b31 100644
--- a/conf/glances.conf
+++ b/conf/glances.conf
@@ -48,20 +48,20 @@ careful=50
 warning=70
 critical=90
 
-# [network]
+#[network]
 # Define the list of hidden network interfaces (comma separeted)
-# hide=lo
+#hide=lo
 # Default limits (in bits per second aka bps) for interface bitrate
-# wlan0_rx_careful=4000000
-# wlan0_rx_warning=5000000
-# wlan0_rx_critical=6000000
-# wlan0_tx_careful=700000
-# wlan0_tx_warning=900000
-# wlan0_tx_critical=1000000
+#wlan0_rx_careful=4000000
+#wlan0_rx_warning=5000000
+#wlan0_rx_critical=6000000
+#wlan0_tx_careful=700000
+#wlan0_tx_warning=900000
+#wlan0_tx_critical=1000000
 
-# [diskio]
+#[diskio]
 # Define the list of hidden disks (comma separeted)
-# hide=sda2,sda5
+#hide=sda2,sda5
 
 [fs]
 # Default limits for free filesytem space in %
@@ -95,3 +95,29 @@ cpu_critical=90
 mem_careful=50
 mem_warning=70
 mem_critical=90
+
+#[monitor]
+# Define the list of processes to monitor
+# *** This section is optional ***
+# The list is composed of items (list_#nb <= 10)
+# An item is defined:
+# * description: Description of the processes (max 16 chars)
+# * regex: regular expression of the processes to monitor
+# * command: (optional) full path to shell command/script for extended stat
+#            Use with caution. Should return a single line string.
+#            Only execute when at least one process is running
+#            By default display CPU and MEM %
+#            Limitation: Do not use in client / server mode
+# * countmin: (optional) minimal number of processes
+#             A warning will be displayed if number of process < count
+# * countmax: (optional) maximum number of processes
+#             A warning will be displayed if number of process > count
+#list_1_description=Dropbox
+#list_1_regex=.*dropbox.*
+#list_1_countmin=1
+#list_1_command=dropbox status | head -1
+#list_1_description=Python programs
+#list_1_regex=.*python.*
+#list_2_description=Famous Xeyes
+#list_2_regex=.*xeyes.*
+#list_2_countmin=1
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index 2eb929ff..c41e49d0 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,7 +2,7 @@
 Glances
 =======
 
-This manual describes *Glances* version 2.0.
+This manual describes *Glances* version 2.0.1.
 
 Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>
 
diff --git a/glances/__init__.py b/glances/__init__.py
index da204a35..d5f119be 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -20,7 +20,7 @@
 """Init the Glances software."""
 
 __appname__ = 'glances'
-__version__ = '2.0'
+__version__ = '2.0.1'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPL'
 
diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py
index 74cf34b8..348ea4a6 100644
--- a/glances/plugins/glances_processlist.py
+++ b/glances/plugins/glances_processlist.py
@@ -24,7 +24,7 @@ import os
 from datetime import timedelta
 
 # Import Glances libs
-from glances.core.glances_globals import glances_processes
+from glances.core.glances_globals import glances_processes, is_windows
 from glances.plugins.glances_plugin import GlancesPlugin
 
 
@@ -149,7 +149,8 @@ class Plugin(GlancesPlugin):
             if nice is None:
                 nice = '?'
             msg = '{0:>5}'.format(nice)
-            if nice != 0:
+            if isinstance(nice, int) and ((is_windows and nice != 32) or
+                                          (not is_windows and nice != 0)):
                 ret.append(self.curse_add_line(msg, decoration='NICE'))
             else:
                 ret.append(self.curse_add_line(msg))
diff --git a/man/glances.1 b/man/glances.1
index cd3e9c0a..bd26c265 100644
--- a/man/glances.1
+++ b/man/glances.1
@@ -1,4 +1,4 @@
-.TH glances 1  "June, 2014" "version 2.0" "USER COMMANDS"
+.TH glances 1  "June, 2014" "version 2.0.1" "USER COMMANDS"
 .SH NAME
 glances \- A cross-platform curses-based system monitoring tool
 .SH SYNOPSIS
diff --git a/setup.py b/setup.py
index e087cd7d..ba2759a9 100755
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,13 @@ def get_requires():
 
 setup(
     name='Glances',
-    version='2.0',
+    version='2.0.1',
     description="A cross-platform curses-based monitoring tool",
     long_description=open('README.rst').read(),
     author='Nicolas Hennion',
     author_email='nicolas@nicolargo.com',
     url='https://github.com/nicolargo/glances',
-    # download_url='https://s3.amazonaws.com/glances/glances-2.0.tar.gz',
+    # download_url='https://s3.amazonaws.com/glances/glances-2.0.1.tar.gz',
     license="LGPL",
     keywords="cli curses monitoring system",
     install_requires=get_requires(),