Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2025-11-29 11:46:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed potential race configuration in first config init

Browse source
This commit is contained in:
Mark Qvist 2025-11-03 21:20:53 +01:00
parent 017a1c1b28
commit ef53318d29
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sbapp/sideband/core.py
View file

@ -292,6 +292,8 @@ class SidebandCore():
try:
self.__load_config()
except Exception as e:
RNS.log(f"An error occurred while loading existing Sideband configuration: {e}", RNS.LOG_ERROR)
RNS.trace_exception(e)
self.__init_config()
self.__load_config()
self.first_run = False
@ -308,7 +310,8 @@ class SidebandCore():
self.clear_exports_dir()
except Exception as e:
RNS.log("Error while configuring Sideband: "+str(e), RNS.LOG_ERROR)
RNS.log(f"Error while configuring Sideband: {e}", RNS.LOG_ERROR)
RNS.trace_exception(e)
if load_config_only:
return
@ -541,6 +544,8 @@ class SidebandCore():
self.config["telemetry_icon"] = SidebandCore.DEFAULT_APPEARANCE[0]
self.config["telemetry_send_to_trusted"] = False
self.config["telemetry_send_to_collector"] = False
self.config["telemetry_allow_requests_from_anyone"] = False
self.config["telemetry_allow_requests_from_trusted"] = False
# Voice
self.config["voice_enabled"] = False
@ -556,7 +561,7 @@ class SidebandCore():
self._db_inittelemetry()
self._db_upgradetables()
self.__save_config()
self.__save_config(no_thread=True)
def clear_map_cache(self):
for entry in os.scandir(self.map_cache):
@ -929,7 +934,7 @@ class SidebandCore():
RNS.log("Error while reloading configuration: "+str(e), RNS.LOG_ERROR)
RNS.trace_exception(e)
def __save_config(self):
def __save_config(self, no_thread=False):
RNS.log("Saving Sideband configuration...", RNS.LOG_DEBUG)
def save_function():
while self.saving_configuration:
@ -943,7 +948,8 @@ class SidebandCore():
self.saving_configuration = False
RNS.log("Error while saving Sideband configuration: "+str(e), RNS.LOG_ERROR)
threading.Thread(target=save_function, daemon=True).start()
if no_thread: save_function()
else: threading.Thread(target=save_function, daemon=True).start()
if self.is_client:
self.setstate("wants.settings_reload", True)