]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/zabbix: cast port to int
authorKefu Chai <kchai@redhat.com>
Wed, 27 Jan 2021 04:58:45 +0000 (12:58 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 27 Jan 2021 11:22:05 +0000 (19:22 +0800)
to appease mypy

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/zabbix/module.py

index c16b98cfb10bea976d1e4032b3eea787810ab4eb..c4f19f38c8b2030dc012afd137a390dbf97a8ea1 100644 (file)
@@ -157,8 +157,11 @@ class Module(MgrModule):
         for server in servers:
             uri = re.match("(?:(?:\[?)([a-z0-9-\.]+|[a-f0-9:\.]+)(?:\]?))(?:((?::))([0-9]{1,5}))?$", server)
             if uri:
-                zabbix_host, sep, zabbix_port = uri.groups()
-                zabbix_port = zabbix_port if sep == ':' else self.config['zabbix_port']
+                zabbix_host, sep, opt_zabbix_port = uri.groups()
+                if sep == ':':
+                    zabbix_port = int(opt_zabbix_port)
+                else:
+                    zabbix_port = cast(int, self.config['zabbix_port'])
                 self._zabbix_hosts.append({'zabbix_host': zabbix_host, 'zabbix_port': zabbix_port})
             else:
                 self.log.error('Zabbix host "%s" is not valid', server)