Stuff
This commit is contained in:
1 parent
7a452eca67
commit
34aa68e987
20 files changed
+804
-170
No files matched your search
@@ -6,9 +6,9 @@ from colony.core.storage import DEFAULT_STORAGE_FILES
|
||||
from colony.core.roles.role import Role
|
||||
from colony.core.roles.unit.role import Unit
|
||||
from colony.core.roles.vaultwarden.role import VaultWarden
|
||||
from colony.settings import configuration
|
||||
from colony.settings import configuration, setting
|
||||
from colony.transport.discover import Discover
|
||||
from colony.utils.network import get_local_subnet
|
||||
from colony.utils.network import hosts_in_range
|
||||
|
||||
|
||||
class Explorer(Role):
|
||||
@@ -112,11 +112,11 @@ class Explorer(Role):
|
||||
configured = configuration.get("explorer.hosts")
|
||||
if isinstance(configured, (list, tuple)) and configured:
|
||||
return [str(host) for host in configured]
|
||||
return [str(host) for host in get_local_subnet().hosts()]
|
||||
return hosts_in_range(setting("discovery.range_start"), setting("discovery.range_end"))
|
||||
|
||||
def _probe(self, ip):
|
||||
try:
|
||||
return ip, Discover.request(ip, timeout=self.SCAN_TIMEOUT)
|
||||
return ip, Discover.request(ip, timeout=self.SCAN_TIMEOUT, discover_port=setting("discovery.discover_port"))
|
||||
except Exception:
|
||||
return ip, None
|
||||
|
||||
|
||||
Reference in new issue
Block a user