diff options
| author | Eugeni Dodonov <eugeni@mandriva.com> | 2010-06-14 15:09:09 -0300 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.com> | 2010-06-14 15:09:09 -0300 |
| commit | c3f507245731a87fd04c95a571cef694b4725b21 (patch) | |
| tree | 614f2451ed8704a900b1e700120dca390fa71596 /src | |
| parent | ee0602c53e8638b4bad8c317962a43fc99159576 (diff) | |
| download | net_monitor-c3f507245731a87fd04c95a571cef694b4725b21.tar net_monitor-c3f507245731a87fd04c95a571cef694b4725b21.tar.gz net_monitor-c3f507245731a87fd04c95a571cef694b4725b21.tar.bz2 net_monitor-c3f507245731a87fd04c95a571cef694b4725b21.tar.xz net_monitor-c3f507245731a87fd04c95a571cef694b4725b21.zip | |
Properly detect when device dissapears (#57108)
Diffstat (limited to 'src')
| -rw-r--r-- | src/monitor.py | 4 | ||||
| -rwxr-xr-x | src/net_monitor | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/monitor.py b/src/monitor.py index 45464f0..5a2bcfe 100644 --- a/src/monitor.py +++ b/src/monitor.py @@ -208,17 +208,19 @@ class Monitor: def get_traffic(self, iface, net=None): """Get traffic information""" + device_exists=False if not net: if not self.net: self.readnet() net = self.net if iface in net: + device_exists=True bytes_in = int(net[iface][0]) bytes_out = int(net[iface][8]) else: bytes_in = 0 bytes_out = 0 - return bytes_in, bytes_out + return device_exists, bytes_in, bytes_out def format_size(self, size, opt=""): """Pretty-Formats size""" diff --git a/src/net_monitor b/src/net_monitor index 5385fd3..650af0b 100755 --- a/src/net_monitor +++ b/src/net_monitor @@ -308,7 +308,7 @@ class MonitorGui: net=self.monitor.readnet() select_page=0 for iface in sorted_ifaces: - data_in, data_out = self.monitor.get_traffic(iface,net) + device_exists, data_in, data_out = self.monitor.get_traffic(iface,net) self.ifaces[iface] = {'data_in': 0, 'data_out': 0, 'total_in': 0, @@ -384,7 +384,7 @@ class MonitorGui: old_data_out = self.ifaces[iface]['data_out'] total_in = self.ifaces[iface]['total_in'] total_out = self.ifaces[iface]['total_out'] - data_in, data_out = self.monitor.get_traffic(iface, net) + device_exists, data_in, data_out = self.monitor.get_traffic(iface, net) # is it a wireless interface? if iface in self.wireless_ifaces: essid = self.monitor.wifi_get_essid(iface) @@ -411,6 +411,10 @@ class MonitorGui: if old_data_in == 0 and old_data_out == 0: old_data_in = data_in old_data_out = data_out + # check if device exists + if not device_exists: + old_data_in = data_in + old_data_out = data_out # check total download diff_in = data_in - old_data_in diff_out = data_out - old_data_out |