improvements
This commit is contained in:
parent
4505e4f2ed
commit
53577d64ab
12
app/util.py
12
app/util.py
@ -28,10 +28,14 @@ def generate_key() -> "RsaKey":
|
|||||||
return RSA.generate(bits=2048)
|
return RSA.generate(bits=2048)
|
||||||
|
|
||||||
|
|
||||||
def ha_replicate(logger: "logging.Logger", ha_replicate: str, ha_role: str, version: str, dls_url: str, dls_port: int, site_key_xid: str, instance_ref: str, origins: list["Origin"], leases: list["Lease"]):
|
def ha_replicate(logger: "logging.Logger", ha_replicate: str, ha_role: str, version: str, dls_url: str, dls_port: int, site_key_xid: str, instance_ref: str, origins: list["Origin"], leases: list["Lease"]) -> bool:
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import httpx
|
import httpx
|
||||||
|
|
||||||
|
if f'{dls_url}:{dls_port}' == ha_replicate:
|
||||||
|
logger.error(f'Failed to replicate this node ({ha_role}) to "{ha_replicate}": can\'t replicate to itself')
|
||||||
|
return False
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
'VERSION': str(version),
|
'VERSION': str(version),
|
||||||
'HA_REPLICATE': f'{dls_url}:{dls_port}',
|
'HA_REPLICATE': f'{dls_url}:{dls_port}',
|
||||||
@ -45,6 +49,6 @@ def ha_replicate(logger: "logging.Logger", ha_replicate: str, ha_role: str, vers
|
|||||||
r = httpx.put(f'https://{ha_replicate}/-/ha/replicate', json=data, verify=False)
|
r = httpx.put(f'https://{ha_replicate}/-/ha/replicate', json=data, verify=False)
|
||||||
if r.status_code == 202:
|
if r.status_code == 202:
|
||||||
logger.info(f'Successfully replicated this node ({ha_role}) to "{ha_replicate}".')
|
logger.info(f'Successfully replicated this node ({ha_role}) to "{ha_replicate}".')
|
||||||
else:
|
return True
|
||||||
logger.error(f'Failed to replicate this node ({ha_role}) to "{ha_replicate}": {r.status_code} - {r.content}')
|
logger.error(f'Failed to replicate this node ({ha_role}) to "{ha_replicate}": {r.status_code} - {r.content}')
|
||||||
|
return False
|
||||||
|
Loading…
Reference in New Issue
Block a user