Change alias definitions to be global, so aliases can be reused across different networks
This commit is contained in:
7
main.py
7
main.py
@@ -17,6 +17,7 @@ filemap = {
|
||||
"monitor": ["monitor.json", "monitoring database", "json"],
|
||||
"tokens": ["tokens.json", "authentication tokens", "json"],
|
||||
"aliasdata": ["aliasdata.json", "data for alias generation", "json"],
|
||||
"alias": ["alias.json", "provisioned alias data", "json"],
|
||||
|
||||
# Binary (pickle) configs
|
||||
"network": ["network.dat", "network list", "pickle"]
|
||||
@@ -59,6 +60,12 @@ def loadConf(var):
|
||||
if filemap[var][2] == "json":
|
||||
with open(configPath+filemap[var][0], "r") as f:
|
||||
globals()[var] = json.load(f)
|
||||
if var == "alias":
|
||||
# This is a hack to convert all the keys into integers since JSON
|
||||
# turns them into strings...
|
||||
# Dammit Jason!
|
||||
global alias
|
||||
alias = {int(x):y for x, y in alias.items()}
|
||||
elif filemap[var][2] == "pickle":
|
||||
try:
|
||||
with open(configPath+filemap[var][0], "rb") as f:
|
||||
|
||||
Reference in New Issue
Block a user