summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--docs/man/glances.12
-rw-r--r--glances/__init__.py2
-rw-r--r--glances/plugins/glances_uptime.py4
4 files changed, 6 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 5ed15c44..2c72655b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,12 @@
Glances Version 2
==============================================================================
-Version 2.X
+Version 2.8.2
=============
Bugs corrected:
+ * InfluxDB export in 2.8.1 is broken (issue #1026)
Version 2.8.1
=============
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 1e5f583d..aa8355e4 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "GLANCES" "1" "Feb 06, 2017" "2.8.1" "Glances"
+.TH "GLANCES" "1" "Feb 07, 2017" "2.8.2" "Glances"
.SH NAME
glances \- An eye on your system
.
diff --git a/glances/__init__.py b/glances/__init__.py
index b388e28f..ac0d515a 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -27,7 +27,7 @@ import signal
import sys
# Global name
-__version__ = '2.8.2_DEVELOP'
+__version__ = '2.8.2'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3'
diff --git a/glances/plugins/glances_uptime.py b/glances/plugins/glances_uptime.py
index c72ba90e..8678ebb3 100644
--- a/glances/plugins/glances_uptime.py
+++ b/glances/plugins/glances_uptime.py
@@ -47,7 +47,7 @@ class Plugin(GlancesPlugin):
self.align = 'right'
# Init the stats
- self.uptime = datetime.now()
+ self.uptime = datetime.now() - datetime.fromtimestamp(psutil.boot_time())
self.reset()
def reset(self):
@@ -59,7 +59,7 @@ class Plugin(GlancesPlugin):
Export uptime in seconds.
"""
- return {'seconds': self.uptime.second}
+ return {'seconds': self.uptime.seconds}
@GlancesPlugin._check_decorator
@GlancesPlugin._log_result_decorator