mirror of https://github.com/nicolargo/glances
3.4.0 crash on startupwith minimal deps #2401
parent
10b5c203d0
commit
230c2fe437
|
@ -7,3 +7,4 @@ packaging; python_version >= "3.7"
|
||||||
python-dateutil
|
python-dateutil
|
||||||
six
|
six
|
||||||
urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392
|
urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392
|
||||||
|
requests # See issue - https://github.com/nicolargo/glances/issues/2233
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
"""Docker Extension unit for Glances' Containers plugin."""
|
"""Docker Extension unit for Glances' Containers plugin."""
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import requests
|
|
||||||
|
|
||||||
from glances.compat import iterkeys, itervalues, nativestr, pretty_date
|
from glances.compat import iterkeys, itervalues, nativestr, pretty_date
|
||||||
from glances.logger import logger
|
from glances.logger import logger
|
||||||
from glances.plugins.containers.stats_streamer import StatsStreamer
|
from glances.plugins.containers.stats_streamer import StatsStreamer
|
||||||
|
@ -19,12 +17,13 @@ from glances.plugins.containers.stats_streamer import StatsStreamer
|
||||||
# Docker-py library (optional and Linux-only)
|
# Docker-py library (optional and Linux-only)
|
||||||
# https://github.com/docker/docker-py
|
# https://github.com/docker/docker-py
|
||||||
try:
|
try:
|
||||||
|
import requests
|
||||||
import docker
|
import docker
|
||||||
from dateutil import parser, tz
|
from dateutil import parser, tz
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
import_docker_error_tag = True
|
import_docker_error_tag = True
|
||||||
# Display debug message if import KeyError
|
# Display debug message if import KeyError
|
||||||
logger.debug("Error loading Docker deps Lib. Docker plugin is disabled ({})".format(e))
|
logger.warning("Error loading Docker deps Lib. Docker plugin is disabled ({})".format(e))
|
||||||
else:
|
else:
|
||||||
import_docker_error_tag = False
|
import_docker_error_tag = False
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ try:
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
import_podman_error_tag = True
|
import_podman_error_tag = True
|
||||||
# Display debug message if import KeyError
|
# Display debug message if import KeyError
|
||||||
logger.debug("Error loading Podman deps Lib. Podman feature in the Containers plugin is disabled ({})".format(e))
|
logger.warning("Error loading Podman deps Lib. Podman feature in the Containers plugin is disabled ({})".format(e))
|
||||||
else:
|
else:
|
||||||
import_podman_error_tag = False
|
import_podman_error_tag = False
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,9 @@ class Plugin(GlancesPlugin):
|
||||||
msg = '{:>{width}}'.format(self.stats[s], width=max_width - len(s) + 2)
|
msg = '{:>{width}}'.format(self.stats[s], width=max_width - len(s) + 2)
|
||||||
ret.append(self.curse_add_line(msg))
|
ret.append(self.curse_add_line(msg))
|
||||||
# Connections track
|
# Connections track
|
||||||
if self.stats['nf_conntrack_enabled']:
|
if self.stats['nf_conntrack_enabled'] and \
|
||||||
|
'nf_conntrack_count' in self.stats and \
|
||||||
|
'nf_conntrack_max' in self.stats:
|
||||||
s = 'Tracked'
|
s = 'Tracked'
|
||||||
ret.append(self.curse_new_line())
|
ret.append(self.curse_new_line())
|
||||||
msg = '{:{width}}'.format(nativestr(s).capitalize(), width=len(s))
|
msg = '{:{width}}'.format(nativestr(s).capitalize(), width=len(s))
|
||||||
|
|
Loading…
Reference in New Issue