mirror of https://github.com/nicolargo/glances
parent
d09039a8e3
commit
4542db556f
5
NEWS
5
NEWS
|
@ -1,3 +1,8 @@
|
||||||
|
Version 1.4.2.1
|
||||||
|
===============
|
||||||
|
|
||||||
|
* Minor patch to solve memomy issue (#94) on Mac OS X
|
||||||
|
|
||||||
Version 1.4.2
|
Version 1.4.2
|
||||||
=============
|
=============
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
__appname__ = 'glances'
|
__appname__ = 'glances'
|
||||||
__version__ = "1.4.2"
|
__version__ = "1.4.2.1"
|
||||||
__author__ = "Nicolas Hennion <nicolas@nicolargo.com>"
|
__author__ = "Nicolas Hennion <nicolas@nicolargo.com>"
|
||||||
__licence__ = "LGPL"
|
__licence__ = "LGPL"
|
||||||
|
|
||||||
|
@ -603,7 +603,11 @@ class glancesStats:
|
||||||
if psutil_mem_vm:
|
if psutil_mem_vm:
|
||||||
# If PsUtil 0.6+
|
# If PsUtil 0.6+
|
||||||
phymem = psutil.virtual_memory()
|
phymem = psutil.virtual_memory()
|
||||||
self.mem = {'cache': phymem.cached + phymem.buffers,
|
if (hasattr(phymem, 'cached') and hasattr(phymem, 'buffers')):
|
||||||
|
cachemem = phymem.cached + phymem.buffers
|
||||||
|
else:
|
||||||
|
cachemem = 0
|
||||||
|
self.mem = {'cache': cachemem,
|
||||||
'total': phymem.total,
|
'total': phymem.total,
|
||||||
'used': phymem.used,
|
'used': phymem.used,
|
||||||
'free': phymem.free,
|
'free': phymem.free,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.TH glances 1 "September, 2012" "version 1.4.2" "USER COMMANDS"
|
.TH glances 1 "October, 2012" "version 1.4.2.1" "USER COMMANDS"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
glances \- CLI curses based monitoring tool
|
glances \- CLI curses based monitoring tool
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -23,8 +23,8 @@ for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
|
||||||
data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
|
data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
|
||||||
|
|
||||||
setup(name='Glances',
|
setup(name='Glances',
|
||||||
version='1.4.2',
|
version='1.4.2.1',
|
||||||
download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.2.tar.gz',
|
download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.2.1.tar.gz',
|
||||||
url='https://github.com/nicolargo/glances',
|
url='https://github.com/nicolargo/glances',
|
||||||
description='CLI curses-based monitoring tool',
|
description='CLI curses-based monitoring tool',
|
||||||
author='Nicolas Hennion',
|
author='Nicolas Hennion',
|
||||||
|
|
Loading…
Reference in New Issue