external/HyperProxmox
1
0
Fork 0
mirror of https://github.com/ThomasGsp/HyperProxmox.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Change errors types

Browse source
This commit is contained in:
Tlams 2018-04-12 17:39:48 +01:00
parent 0392262277
commit 611fda8d6d
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
code/scripts/main/core/modules/mod_analyst.py
View file

@ -57,12 +57,12 @@ class Analyse:
def run(self, instancetype="all"): def run(self, instancetype="all"):
""" Active logger""" """ Active logger"""
logger = Logger2(self.generalconf["logger"]) logger = Logger2(self.generalconf["logger"])
logger.write({"result": "INFO", "type": "PYTHON", "value": "Start logger - Analyst Module"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Start logger - Analyst Module"})
insert_time = time.time() insert_time = time.time()
""" Create lock file """ """ Create lock file """
logger.write({"result": "INFO", "type": "PYTHON", "value": "Create locker file"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Create locker file"})
locker = Locker() locker = Locker()
locker.createlock(self.generalconf["analyst"]["walker_lock"], "analyst", insert_time) locker.createlock(self.generalconf["analyst"]["walker_lock"], "analyst", insert_time)
@ -192,9 +192,9 @@ class Analyse:
instance["uniqid"] = getidfromdesc.group(1) instance["uniqid"] = getidfromdesc.group(1)
if getidfromdesc.group(1) in idlist: if getidfromdesc.group(1) in idlist:
logger.write( logger.write(
{"result": "WARNING", "type": "PYTHON", "value": "Double ID detected: {0}".format(getidfromdesc.group(1))}) {"result": "WARNING", "type": "HYPERPROXMOX", "value": "Double ID detected: {0}".format(getidfromdesc.group(1))})
logger.write({"result": "WARNING", "type": "PYTHON", "value": json.dumps(instance)}) logger.write({"result": "WARNING", "type": "HYPERPROXMOX", "value": json.dumps(instance)})
logger.write({"result": "WARNING", "type": "PYTHON", "value": "-------------------"}) logger.write({"result": "WARNING", "type": "HYPERPROXMOX", "value": "-------------------"})
else: else:
idlist.append(getidfromdesc.group(1)) idlist.append(getidfromdesc.group(1))

18
code/scripts/main/startup.py
View file

@ -42,8 +42,8 @@ if __name__ == "__main__":
""" Active logger""" """ Active logger"""
logger = Logger2(generalconf["logger"]) logger = Logger2(generalconf["logger"])
logger.write({"result": "INFO", "type": "PYTHON", "value": "Start logger"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Start logger"})
logger.write({"result": "INFO", "type": "PYTHON", "value": ">>>>>>> -- NEW STARTUP -- <<<<<<<"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": ">>>>>>> -- NEW STARTUP -- <<<<<<<"})
CritConf = CryticalData() CritConf = CryticalData()
""" Step One: test private key or create it """ """ Step One: test private key or create it """
@ -56,7 +56,7 @@ if __name__ == "__main__":
print("This action can take some minutes, please wait.") print("This action can take some minutes, please wait.")
gen = CritConf.generate_key(localconf['system']['key_pvt'], localconf['system']['key_pub'], passhash) gen = CritConf.generate_key(localconf['system']['key_pvt'], localconf['system']['key_pub'], passhash)
if gen['result'] == "OK": if gen['result'] == "OK":
logger.write({"result": "INFO", "type": "PYTHON", "value": "Key generated in {0}".format(localconf['system']['key_pvt'])}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Key generated in {0}".format(localconf['system']['key_pvt'])})
print("Your new key has been generate ! " print("Your new key has been generate ! "
"\n - Private Key: {0} " "\n - Private Key: {0} "
"\n - Public Key: {1}" "\n - Public Key: {1}"
@ -66,7 +66,7 @@ if __name__ == "__main__":
key_pvt = CritConf.read_private_key(localconf['system']['key_pvt'], passhash) key_pvt = CritConf.read_private_key(localconf['system']['key_pvt'], passhash)
else: else:
print(gen['Error']) print(gen['Error'])
logger.write({"result": "ERROR", "type": "PYTHON", "value": "Your key is not create due to an error: {0}".format(gen['value'])}) logger.write({"result": "ERROR", "type": "HYPERPROXMOX", "value": "Your key is not create due to an error: {0}".format(gen['value'])})
exit(1) exit(1)
""" Test valid right for your private Key """ """ Test valid right for your private Key """
@ -76,7 +76,7 @@ if __name__ == "__main__":
format(oct(stat.S_IMODE(os.stat(localconf['system']['key_pvt']).st_mode)))) format(oct(stat.S_IMODE(os.stat(localconf['system']['key_pvt']).st_mode))))
os.chmod(localconf['system']['key_pvt'], 0o600) os.chmod(localconf['system']['key_pvt'], 0o600)
print("Auto correction... done !") print("Auto correction... done !")
logger.write({"result": "INFO", "type": "PYTHON", "value": "Setting chmod on your key.."}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Setting chmod on your key.."})
""" Step two""" """ Step two"""
if 'passhash' not in vars(): if 'passhash' not in vars():
@ -85,10 +85,10 @@ if __name__ == "__main__":
if key_pvt['result'] != "OK": if key_pvt['result'] != "OK":
print("{0}: {1}" print("{0}: {1}"
"\n Please verify your passphrase".format(key_pvt['type'], key_pvt['error'])) "\n Please verify your passphrase".format(key_pvt['type'], key_pvt['error']))
logger.write({"result": "WARNING", "type": "PYTHON", "value": "Bad passphrase, try again."}) logger.write({"result": "WARNING", "type": "HYPERPROXMOX", "value": "Bad passphrase, try again."})
exit(1) exit(1)
logger.write({"result": "INFO", "type": "PYTHON", "value": "Loading keys in memory"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Loading keys in memory"})
key_pub = CritConf.read_public_key(localconf['system']['key_pub']) key_pub = CritConf.read_public_key(localconf['system']['key_pub'])
generalconf["keys"] = {"key_pvt": key_pvt["value"], "key_pub": key_pub["value"]} generalconf["keys"] = {"key_pvt": key_pvt["value"], "key_pub": key_pub["value"]}
@ -147,10 +147,10 @@ if __name__ == "__main__":
) )
""" Init Core thread """ """ Init Core thread """
logger.write({"result": "INFO", "type": "PYTHON", "value": "Init Core thread"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Init Core thread"})
core = Core(generalconf) core = Core(generalconf)
""" Init API thread """ """ Init API thread """
logger.write({"result": "INFO", "type": "PYTHON", "value": "Init API thread"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Init API thread"})
api_th = ThreadAPI(1, "ThreadAPI", urls, core, generalconf) api_th = ThreadAPI(1, "ThreadAPI", urls, core, generalconf)
api_th.start() api_th.start()