vbatts/maubot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for reloading webapp and database meta flags

Browse source
This commit is contained in:
Tulir Asokan 2021-06-11 12:41:51 +03:00
parent ac2f234d4e
commit b7f6c08b2b
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
maubot/instance.py
View file

@ -113,15 +113,26 @@ class PluginInstance:
self.db_instance.enabled = False self.db_instance.enabled = False
return False return False
if self.loader.meta.database: if self.loader.meta.database:
db_path = os.path.join(self.mb_config["plugin_directories.db"], self.id) self.enable_database()
self.inst_db = sql.create_engine(f"sqlite:///{db_path}.db")
if self.loader.meta.webapp: if self.loader.meta.webapp:
self.inst_webapp, self.inst_webapp_url = self.webserver.get_instance_subapp(self.id) self.enable_webapp()
self.log.debug("Plugin instance dependencies loaded") self.log.debug("Plugin instance dependencies loaded")
self.loader.references.add(self) self.loader.references.add(self)
self.client.references.add(self) self.client.references.add(self)
return True return True
def enable_webapp(self) -> None:
self.inst_webapp, self.inst_webapp_url = self.webserver.get_instance_subapp(self.id)
def disable_webapp(self) -> None:
self.webserver.remove_instance_webapp(self.id)
self.inst_webapp = None
self.inst_webapp_url = None
def enable_database(self) -> None:
db_path = os.path.join(self.mb_config["plugin_directories.db"], self.id)
self.inst_db = sql.create_engine(f"sqlite:///{db_path}.db")
def delete(self) -> None: def delete(self) -> None:
if self.loader is not None: if self.loader is not None:
self.loader.references.remove(self) self.loader.references.remove(self)
@ -138,7 +149,7 @@ class PluginInstance:
os.path.join(self.mb_config["plugin_directories.db"], f"{self.id}.db"), os.path.join(self.mb_config["plugin_directories.db"], f"{self.id}.db"),
reason="deleted") reason="deleted")
if self.inst_webapp: if self.inst_webapp:
self.webserver.remove_instance_webapp(self.id) self.disable_webapp()
def load_config(self) -> CommentedMap: def load_config(self) -> CommentedMap:
return yaml.load(self.db_instance.config) return yaml.load(self.db_instance.config)
@ -160,6 +171,15 @@ class PluginInstance:
if not self.load(): if not self.load():
return return
cls = await self.loader.load() cls = await self.loader.load()
if self.loader.meta.webapp and self.inst_webapp is None:
self.log.debug("Enabling webapp after plugin meta reload")
self.enable_webapp()
elif not self.loader.meta.webapp and self.inst_webapp is not None:
self.log.debug("Disabling webapp after plugin meta reload")
self.disable_webapp()
if self.loader.meta.database and self.inst_db is None:
self.log.debug("Enabling database after plugin meta reload")
self.enable_database()
config_class = cls.get_config_class() config_class = cls.get_config_class()
if config_class: if config_class:
try: try: