PartagesPublics
/
papi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes and error processing

This commit is contained in:
Colin Goutte 2021-12-14 10:31:26 +01:00
parent dd2d0c0962
commit a7b6a0560f
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
papi/relais.py
View File

@ -31,47 +31,58 @@ def api_login(config):
logged.append(session)
logger.info("Logged")
else: # pragma: no cover
err = f'{login_r.reason}: {login_r.text} for "{config["api_user_login"]}" on "{config["api_login_url"]}'
err = f'{login_r.reason}: {login_r.text} for "{config["api_user_login"]}" on "{config["api_login_url"]}"'
logger.info("Login error {err}")
raise ValueError(err)
return login_r
def api_fetch(conf):
breakpoint()
def api_fetch(config):
if not logged:
api_login(conf)
apiurl = conf['api_status_url']
fetched = session.get("%s/status" % apiurl)
api_login(config)
apiurl = config["api_status_url"]
fetched = session.get(apiurl)
if fetched.ok:
logger.info("Fetched")
else: # pragma: no cover
err = f'{fetched.reason}: {fetched.text} on "{config["api_status_url"]}"'
logger.info("Login error {err}")
raise ValueError(err)
return fetched
def api_forward(config, data):
post_url = f'{config["forward_api_address"]}/sonde/conf{"identifiant_sonde"}'
breakpoint()
post_url = f'{config["forward_api_address"]}/sonde/{config["identifiant_sonde"]}'
res = session.post(post_url, json=data)
print(res.ok)
print(res.json())
return res
def forward_api_error(conf,message=""):
breakpoint()
def forward_api_error(config, message=""):
forward_urls = [
# "https://papi.silib.re/sonde/test/error/",
f'{config["forward_api_address"]}/sonde/{config["identifiant_sonde"]}',
"http://localhost:8000/sonde/838266b2-fc3a-4430-95e8-f7f0d0fc9871/error/",
# "http://localhost:8000/sonde/test/error/",
]
message = message or "Erreur inconnue"
for post_url in forward_urls:
res = session.post(post_url, json={"msg": message})
forwarded_error = session.post(post_url, json={"msg": message})
print(post_url)
print(res.ok)
print(res.json())
print(forwarded_error.ok)
print(forwarded_error.json())
pass
if forwarded_error.ok:
logger.info("Fetched")
else: # pragma: no cover
err = f'{forwarded_error.reason}: {fetched.text} on "{config["api_status_url"]}"'
logger.info("Login error {err}")
raise ValueError(err)
def main(
@ -97,7 +108,7 @@ def main(
except Exception as E:
forward_error(conf,str(E))
else:
forward(confconf,current)
forward(conf, current)
if __name__ == "__main__":