Create a default AMP to replace the Monitoring process list

2 files changed, 6 insertions, 3 deletions

diff --git a/glances/amps/glances_amp.py b/glances/amps/glances_amp.py
index 6148971f..2094070d 100644
--- a/glances/amps/glances_amp.py
+++ b/glances/amps/glances_amp.py
@@ -46,12 +46,15 @@ class GlancesAmp(object):
     AUTHOR = '?'
     EMAIL = '?'
 
-    def __init__(self, args=None):
+    def __init__(self, name=None, args=None):
         """Init AMP classe."""
         logger.debug("Init {0} version {1}".format(self.NAME, self.VERSION))
 
         # AMP name (= module name without glances_)
-        self.amp_name = self.__class__.__module__[len('glances_'):]
+        if name is None:
+            self.amp_name = self.__class__.__module__[len('glances_'):]
+        else:
+            self.amp_name = name
 
         # Init the args
         self.args = args
diff --git a/glances/amps/glances_nginx.py b/glances/amps/glances_nginx.py
index 3d7d65a1..a312680d 100644
--- a/glances/amps/glances_nginx.py
+++ b/glances/amps/glances_nginx.py
@@ -82,7 +82,7 @@ class Amp(GlancesAmp):
             res = requests.get(self.get('status_url'))
             if res.ok:
                 # u'Active connections: 1 \nserver accepts handled requests\n 1 1 1 \nReading: 0 Writing: 1 Waiting: 0 \n'
-                self.set_result(res.text)
+                self.set_result(res.text.rstrip())
             else:
                 logger.debug('{0}: Can not grab status URL {1} ({2})'.format(self.NAME, self.get('status_url'), res.reason))