summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2023-05-17 11:18:37 +0200
committernicolargo <nicolas@nicolargo.com>2023-05-17 11:18:37 +0200
commit230c2fe437fe27066926102798df9304931d31e3 (patch)
treefe7d5934f444780845c7d438a7527ee2cb721f82
parent10b5c203d00f440377231e629a044c0970435a07 (diff)
3.4.0 crash on startupwith minimal deps #2401
-rw-r--r--docker-requirements.txt1
-rw-r--r--glances/plugins/containers/glances_docker.py5
-rw-r--r--glances/plugins/containers/glances_podman.py2
-rw-r--r--glances/plugins/glances_connections.py4
4 files changed, 7 insertions, 5 deletions
diff --git a/docker-requirements.txt b/docker-requirements.txt
index 410eba8f..0792572a 100644
--- a/docker-requirements.txt
+++ b/docker-requirements.txt
@@ -7,3 +7,4 @@ packaging; python_version >= "3.7"
python-dateutil
six
urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392
+requests # See issue - https://github.com/nicolargo/glances/issues/2233
diff --git a/glances/plugins/containers/glances_docker.py b/glances/plugins/containers/glances_docker.py
index e2bba26e..fbee2185 100644
--- a/glances/plugins/containers/glances_docker.py
+++ b/glances/plugins/containers/glances_docker.py
@@ -10,8 +10,6 @@
"""Docker Extension unit for Glances' Containers plugin."""
import time
-import requests
-
from glances.compat import iterkeys, itervalues, nativestr, pretty_date
from glances.logger import logger
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)
# https://github.com/docker/docker-py
try:
+ import requests
import docker
from dateutil import parser, tz
except Exception as e:
import_docker_error_tag = True
# 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:
import_docker_error_tag = False
diff --git a/glances/plugins/containers/glances_podman.py b/glances/plugins/containers/glances_podman.py
index f2476754..3956b525 100644
--- a/glances/plugins/containers/glances_podman.py
+++ b/glances/plugins/containers/glances_podman.py
@@ -20,7 +20,7 @@ try:
except Exception as e:
import_podman_error_tag = True
# 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:
import_podman_error_tag = False
diff --git a/glances/plugins/glances_connections.py b/glances/plugins/glances_connections.py
index 5047a2af..27976bb8 100644
--- a/glances/plugins/glances_connections.py
+++ b/glances/plugins/glances_connections.py
@@ -158,7 +158,9 @@ class Plugin(GlancesPlugin):
msg = '{:>{width}}'.format(self.stats[s], width=max_width - len(s) + 2)
ret.append(self.curse_add_line(msg))
# 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'
ret.append(self.curse_new_line())
msg = '{:{width}}'.format(nativestr(s).capitalize(), width=len(s))