merged chango of timeouts on 3.0

2021-03-01 11:14:02 +01:00 · 2021-03-01 11:14:02 +01:00 · 8ab1342775
commit 8ab1342775
parent f602d641a0
2 changed files with 9 additions and 6 deletions
--- a/actor/.env
+++ b/actor/.env
@ -0,0 +1,2 @@
+PYTHONPATH=./src:${PYTHONPATH}
+
--- a/server/src/uds/services/PhysicalMachines/service_multi.py
+++ b/server/src/uds/services/PhysicalMachines/service_multi.py
@ -87,7 +87,7 @@ class IPMachinesService(IPServiceBase):
    skipTimeOnFailure = gui.NumericField(
        length=6,
        label=_('Skip time'),
-        defvalue='15',
+        defvalue='0',
        order=2,
        tooltip=_('If a host fails to check, skip it for this time (in minutes).'),
        minValue=0,
@ -225,6 +225,7 @@ class IPMachinesService(IPServiceBase):
                                self._skipTimeOnFailure,
                            )
                            self.storage.remove(theIP)  # Return Machine to pool
+                            if self._skipTimeOnFailure > 0:
                                self.cache.put(
                                    'port{}'.format(theIP),
                                    '1',