XF/monolith
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Implement additional error checking for provisioning instances and parsing messages, and prevent ZNC from auto-connecting an instance if ConnectOnCreate is off

Browse Source
This commit is contained in:
Mark Veidemanis
2019-02-01 23:26:01 +00:00
parent 8926cb76ec
commit a4b7bd50b1
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/provision.py
View File

@@ -54,8 +54,8 @@ def provisionRelayForAlias(relay, alias):
return True
def provisionRelayForNetwork(relay, alias, network):
if "networks" in main.relay[relay].keys():
if network in main.relay[relay]["networks"]:
if all([x in ["users", "networks"] for x in main.relay[relay].keys() if x in ["users", "networks"]]):
if network in main.relay[relay]["networks"] and alias in main.relay[relay]["users"]:
return "PROVISIONED"
else:
main.relay[relay]["networks"] = []
@@ -87,5 +87,8 @@ def provisionRelayForNetwork(relay, alias, network):
main.saveConf("pool")
if main.config["ConnectOnCreate"]:
startBot(network+i)
else:
deliverRelayCommands(relay, {"status": ["Disconnect"]}, user=alias+"/"+network)
storedNetwork = True
return network+i