loic/clusterman
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/clusterman.git synced 2025-04-06 03:56:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loïc Guégan 2023-10-26 15:34:04 +02:00
parent 3e67064278
commit 068fba0484
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clusterman/commands/node.py
View file

@ -3,7 +3,7 @@ from clusterman.config import CONF
def ls(): def ls():
nodes_path=CONF["paths"]["nodes"] nodes_path=CONF.NODE_FILE
nodes=None nodes=None
if os.path.exists(nodes_path): if os.path.exists(nodes_path):
with open(nodes_path) as f: with open(nodes_path) as f:
@ -14,7 +14,6 @@ def ls():
for node in nodes: for node in nodes:
print(node) print(node)
def scan(timeout): def scan(timeout):
from_split=[int(n) for n in CONF["cluster"]["ip4_from"].split(".")] from_split=[int(n) for n in CONF["cluster"]["ip4_from"].split(".")]
to_split=[int(n) for n in CONF["cluster"]["ip4_to"].split(".")] to_split=[int(n) for n in CONF["cluster"]["ip4_to"].split(".")]
@ -36,13 +35,13 @@ def scan(timeout):
print("=> Found!!") print("=> Found!!")
else: else:
print("") print("")
with open(CONF["paths"]["nodes"], "w") as f: with open(CONF.NODE_FILE, "w") as f:
f.write(json.dumps(nodes,indent=4)) f.write(json.dumps(nodes,indent=4))
CONF["cluster"]["last_scan"]=int(time.time()) CONF["cache"]["last_scan"]=int(time.time())
CONF.save() CONF.save()
def check(timeout): def check(timeout):
nodes_path=CONF["paths"]["nodes"] nodes_path=CONF.NODE_FILE
nodes=None nodes=None
if os.path.exists(nodes_path): if os.path.exists(nodes_path):
with open(nodes_path) as f: with open(nodes_path) as f:

19
clusterman/config.py
View file

@ -5,22 +5,22 @@ import os, json
class Config: class Config:
CONF_DIR=os.path.join(os.environ['HOME'],".clusterman/") CONF_DIR=os.path.join(os.environ['HOME'],".clusterman/")
CONF_FILE=os.path.join(CONF_DIR,"clusterman.json") CONF_FILE=os.path.join(CONF_DIR,"clusterman.json")
CACHE_FILE=os.path.join(CONF_DIR,"cache.json")
NODE_FILE=os.path.join(CONF_DIR,"nodeslist.json")
DEFAULT_CONFIG = { DEFAULT_CONFIG = {
"paths": {
"nodes": os.path.join(CONF_DIR,"nodeslist.json")
},
"cluster": { "cluster": {
"ip4_from": "10.128.0.133", "ip4_from": "10.128.0.133",
"ip4_to": "10.128.0.140", "ip4_to": "10.128.0.140",
"ip4_ignore": ["10.0.0.5", "10.0.0.1"], "ip4_ignore": ["10.0.0.5", "10.0.0.1"],
"last_scan": None
}, },
"plugins": [],
"timeout": 0.5 "timeout": 0.5
} }
def __init__(self): def __init__(self):
Path(self.CONF_DIR).mkdir(parents=True, exist_ok=True) Path(self.CONF_DIR).mkdir(parents=True, exist_ok=True)
self.config=self.DEFAULT_CONFIG self.config=self.DEFAULT_CONFIG
self.cache=dict()
self.load() self.load()
def load(self): def load(self):
@ -29,12 +29,23 @@ class Config:
self.config=json.load(f) self.config=json.load(f)
else: else:
self.save() self.save()
if os.path.exists(self.CACHE_FILE):
with open(self.CACHE_FILE) as f:
self.cache=json.load(f)
else:
self.save()
def save(self): def save(self):
with open(self.CONF_FILE, "w") as f: with open(self.CONF_FILE, "w") as f:
f.write(json.dumps(self.config,indent=4, sort_keys=True)) f.write(json.dumps(self.config,indent=4, sort_keys=True))
with open(self.CACHE_FILE, "w") as f:
f.write(json.dumps(self.cache,indent=4, sort_keys=True))
def __getitem__(self, key): def __getitem__(self, key):
if key=="cache":
return self.cache;
return self.config[key] return self.config[key]
def __setitem__(self, key, value): def __setitem__(self, key, value):