aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: update the in-memory settings object when the DB is updated

Browse source
This commit is contained in:
Vlad Stan 2022-12-09 14:53:51 +02:00
parent 6252119485
commit e28dea97d8
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lnbits/core/services.py
View file

@ -408,9 +408,7 @@ async def update_wallet_balance(wallet_id: str, amount: int):
async def check_admin_settings(): async def check_admin_settings():
if settings.lnbits_admin_ui: if settings.lnbits_admin_ui:
sets = await get_super_settings() sets = await get_super_settings()
if not sets: if not sets:
# create new settings if table is empty # create new settings if table is empty
@ -422,12 +420,7 @@ async def check_admin_settings():
sets = await get_super_settings() sets = await get_super_settings()
if sets: if sets:
for key, value in sets.dict().items(): update_cached_settings(sets.dict())
if not key in readonly_variables:
try:
setattr(settings, key, value)
except:
logger.error(f"error overriding setting: {key}, value: {value}")
# printing settings for debugging # printing settings for debugging
logger.debug(f"Admin settings:") logger.debug(f"Admin settings:")
@ -449,6 +442,15 @@ async def check_admin_settings():
settings.send_admin_user_to_saas() settings.send_admin_user_to_saas()
def update_cached_settings(sets_dict: dict):
for key, value in sets_dict.items():
if not key in readonly_variables:
try:
setattr(settings, key, value)
except:
logger.error(f"error overriding setting: {key}, value: {value}")
class WebsocketConnectionManager: class WebsocketConnectionManager:
def __init__(self): def __init__(self):
self.active_connections: List[WebSocket] = [] self.active_connections: List[WebSocket] = []

3
lnbits/core/views/admin_api.py
View file

@ -7,7 +7,7 @@ from starlette.exceptions import HTTPException
from lnbits.core.crud import get_wallet from lnbits.core.crud import get_wallet
from lnbits.core.models import User from lnbits.core.models import User
from lnbits.core.services import update_wallet_balance from lnbits.core.services import update_cached_settings, update_wallet_balance
from lnbits.decorators import check_admin from lnbits.decorators import check_admin
from lnbits.server import server_restart from lnbits.server import server_restart
from lnbits.settings import AdminSettings, EditableSetings from lnbits.settings import AdminSettings, EditableSetings
@ -61,6 +61,7 @@ async def api_topup_balance(
) )
async def api_update_settings(data: EditableSetings): async def api_update_settings(data: EditableSetings):
await update_admin_settings(data) await update_admin_settings(data)
update_cached_settings(dict(data))
return {"status": "Success"} return {"status": "Success"}