mirror of https://github.com/nicolargo/glances
Revert "Infrequently crashing due to assert (issue #623)"
This reverts commit 79dc79f9f1
.
See PR #683.
pull/686/head
parent
2b1b80c032
commit
168969bdf4
|
@ -119,11 +119,7 @@ class Plugin(GlancesPlugin):
|
||||||
for key in ['cpu', 'mem', 'swap']:
|
for key in ['cpu', 'mem', 'swap']:
|
||||||
if key == 'cpu' and args.percpu:
|
if key == 'cpu' and args.percpu:
|
||||||
for cpu in self.stats['percpu']:
|
for cpu in self.stats['percpu']:
|
||||||
try:
|
|
||||||
bar.percent = cpu['total']
|
bar.percent = cpu['total']
|
||||||
except AssertionError:
|
|
||||||
logger.error("Quicklook: {0} percent error 0 < {1} > 100".format(key, cpu['total']))
|
|
||||||
continue
|
|
||||||
if cpu[cpu['key']] < 10:
|
if cpu[cpu['key']] < 10:
|
||||||
msg = '{0:3}{1} '.format(key.upper(), cpu['cpu_number'])
|
msg = '{0:3}{1} '.format(key.upper(), cpu['cpu_number'])
|
||||||
else:
|
else:
|
||||||
|
@ -135,11 +131,7 @@ class Plugin(GlancesPlugin):
|
||||||
ret.append(self.curse_add_line(' '))
|
ret.append(self.curse_add_line(' '))
|
||||||
ret.append(self.curse_new_line())
|
ret.append(self.curse_new_line())
|
||||||
else:
|
else:
|
||||||
try:
|
|
||||||
bar.percent = self.stats[key]
|
bar.percent = self.stats[key]
|
||||||
except AssertionError:
|
|
||||||
logger.error("Quicklook: {0} percent error 0 < {1} > 100".format(key, self.stats[key]))
|
|
||||||
continue
|
|
||||||
msg = '{0:4} '.format(key.upper())
|
msg = '{0:4} '.format(key.upper())
|
||||||
ret.append(self.curse_add_line(msg))
|
ret.append(self.curse_add_line(msg))
|
||||||
ret.append(self.curse_add_line(bar.pre_char, decoration='BOLD'))
|
ret.append(self.curse_add_line(bar.pre_char, decoration='BOLD'))
|
||||||
|
|
Loading…
Reference in New Issue