oscar.krause/fastapi-dls
2
3
Fork 1
Code Issues 5 Pull Requests Releases Activity

ha improvements

Browse Source
This commit is contained in:
Oscar Krause 2023-02-28 09:00:20 +01:00
parent a3cbcd8df7
commit de28d000e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/main.py
View File

@ -36,7 +36,7 @@ db_init(db), migrate(db)
# everything prefixed with "INSTANCE_*" is used as "SERVICE_INSTANCE_*" or "SI_*" in official dls service # everything prefixed with "INSTANCE_*" is used as "SERVICE_INSTANCE_*" or "SI_*" in official dls service
DLS_URL = str(env('DLS_URL', 'localhost')) DLS_URL = str(env('DLS_URL', 'localhost'))
DLS_PORT = int(env('DLS_PORT', '443')) DLS_PORT = int(env('DLS_PORT', '443'))
HA_REPLICATE, HA_ROLE = env('HA_REPLICATE', None), env('HA_ROLE', None) HA_REPLICATE, HA_ROLE = env('HA_REPLICATE', None), env('HA_ROLE', None) # only failover is supported
SITE_KEY_XID = str(env('SITE_KEY_XID', '00000000-0000-0000-0000-000000000000')) SITE_KEY_XID = str(env('SITE_KEY_XID', '00000000-0000-0000-0000-000000000000'))
INSTANCE_REF = str(env('INSTANCE_REF', '10000000-0000-0000-0000-000000000001')) INSTANCE_REF = str(env('INSTANCE_REF', '10000000-0000-0000-0000-000000000001'))
ALLOTMENT_REF = str(env('ALLOTMENT_REF', '20000000-0000-0000-0000-000000000001')) ALLOTMENT_REF = str(env('ALLOTMENT_REF', '20000000-0000-0000-0000-000000000001'))
@ -295,8 +295,8 @@ async def _ha_replicate_by_ha(request: Request):
logger.error(f'Version missmatch on HA replication task!') logger.error(f'Version missmatch on HA replication task!')
return JSONr(status_code=503, content={'status': 503, 'detail': 'Missmatch for "INSTANCE_REF"'}) return JSONr(status_code=503, content={'status': 503, 'detail': 'Missmatch for "INSTANCE_REF"'})
remote_time, max_seconds_behind = j.get('cur_time'), 30 sync_timestamp, max_seconds_behind = j.get('sync_timestamp'), 30
if remote_time <= cur_time - timedelta(seconds=max_seconds_behind): if sync_timestamp <= cur_time - timedelta(seconds=max_seconds_behind):
logger.error(f'Request time more than {max_seconds_behind}s behind!') logger.error(f'Request time more than {max_seconds_behind}s behind!')
return JSONr(status_code=503, content={'status': 503, 'detail': 'Request time behind'}) return JSONr(status_code=503, content={'status': 503, 'detail': 'Request time behind'})
@ -625,7 +625,7 @@ async def app_on_startup():
Your client-token file (.tok) is valid for {str(CLIENT_TOKEN_EXPIRE_DELTA)}. Your client-token file (.tok) is valid for {str(CLIENT_TOKEN_EXPIRE_DELTA)}.
''') ''')
if HA_REPLICATE is not None: if HA_REPLICATE is not None and HA_ROLE is not None:
from hashlib import sha1 from hashlib import sha1
sha1digest = sha1(INSTANCE_KEY_RSA.export_key()).hexdigest() sha1digest = sha1(INSTANCE_KEY_RSA.export_key()).hexdigest()

2
app/util.py
View File

@ -39,7 +39,7 @@ def ha_replicate(logger: "logging.Logger", ha_replicate: str, ha_role: str, vers
'INSTANCE_REF': str(instance_ref), 'INSTANCE_REF': str(instance_ref),
'origins': [origin.serialize() for origin in origins], 'origins': [origin.serialize() for origin in origins],
'leases': [lease.serialize() for lease in leases], 'leases': [lease.serialize() for lease in leases],
'cur_time': datetime.utcnow(), 'sync_timestamp': datetime.utcnow().isoformat(),
} }
r = httpx.put(f'https://{ha_replicate}/-/ha/replicate', json=data) r = httpx.put(f'https://{ha_replicate}/-/ha/replicate', json=data)