nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-26 02:31:36 +03:00
Code Issues Projects Releases Wiki Activity

Glances stopped working when using VPN with no internet access. #842

Browse Source
This commit is contained in:
Nicolargo 2016-04-04 16:24:20 +02:00
parent e4c3cffbdb
commit ff613348eb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -16,6 +16,7 @@ Bugs corrected:
* Crash on launch when viewing temperature of laptop HDD in sleep mode (issue #824) * Crash on launch when viewing temperature of laptop HDD in sleep mode (issue #824)
* [Web UI] Fix folders plugin never displayed (issue #829) * [Web UI] Fix folders plugin never displayed (issue #829)
* Correct issue IP plugin: VPN with no internet access (issue #842)
Version 2.6.1 Version 2.6.1
============= =============

8
glances/plugins/glances_ip.py
View File

@ -2,7 +2,7 @@
# #
# This file is part of Glances. # This file is part of Glances.
# #
# Copyright (C) 2015 Nicolargo <nicolas@nicolargo.com> # Copyright (C) 2016 Nicolargo <nicolas@nicolargo.com>
# #
# Glances is free software; you can redistribute it and/or modify # Glances is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by # it under the terms of the GNU Lesser General Public License as published by
@ -132,8 +132,12 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = 'IP ' msg = 'IP '
ret.append(self.curse_add_line(msg, 'TITLE')) ret.append(self.curse_add_line(msg, 'TITLE'))
msg = '{0:}/{1}'.format(self.stats['address'], self.stats['mask_cidr']) msg = '{0:}'.format(self.stats['address'])
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
if 'mask_cidr' in self.stats:
# VPN with no internet access (issue #842)
msg = '/{0}'.format(self.stats['mask_cidr'])
ret.append(self.curse_add_line(msg))
if self.stats['public_address'] is not None: if self.stats['public_address'] is not None:
msg = ' Pub ' msg = ' Pub '
ret.append(self.curse_add_line(msg, 'TITLE')) ret.append(self.curse_add_line(msg, 'TITLE'))