mirror of
https://github.com/RYGhub/royalnet.git
synced 2024-11-23 19:44:20 +00:00
BREAKING: Update process launcher
This commit is contained in:
parent
1081f11fc1
commit
6590a56ab5
5 changed files with 136 additions and 122 deletions
|
|
@ -1,10 +1,14 @@
|
|||
from typing import *
|
||||
|
||||
import logging
|
||||
import multiprocessing
|
||||
import time
|
||||
|
||||
import click
|
||||
import toml
|
||||
|
||||
import royalnet.utils as ru
|
||||
import royalnet.serf as rs
|
||||
|
||||
try:
|
||||
import royalnet.serf.telegram as rst
|
||||
|
|
@ -40,12 +44,11 @@ log = logging.getLogger(__name__)
|
|||
|
||||
|
||||
@click.command()
|
||||
@click.option("-c", "--config-filename", default="./config.toml", type=click.Path(exists=True),
|
||||
@click.option("-c", "--config-file", default="./config.toml", type=click.File(encoding="utf8"),
|
||||
help="The filename of the Royalnet configuration file.")
|
||||
def run(config_filename: str):
|
||||
def run(config_file: str):
|
||||
# Read the configuration file
|
||||
with open(config_filename, "r") as t:
|
||||
config: dict = toml.load(t)
|
||||
config: dict = toml.load(config_file)
|
||||
|
||||
ru.init_logging(config["Logging"])
|
||||
|
||||
|
|
@ -56,55 +59,61 @@ def run(config_filename: str):
|
|||
ru.init_sentry(config["Sentry"])
|
||||
except ImportError:
|
||||
log.info("Sentry: not installed")
|
||||
else:
|
||||
log.info("Sentry: enabled")
|
||||
|
||||
# Herald Server
|
||||
herald_cfg = None
|
||||
herald_process = None
|
||||
if rh is not None and "Herald" in config:
|
||||
if "Local" in config["Herald"] and config["Herald"]["Local"]["enabled"]:
|
||||
processes: Dict[str, ru.RoyalnetProcess] = {}
|
||||
"""A list of all processes that the launcher should start and monitor."""
|
||||
|
||||
herald_cfg = config.get("Herald")
|
||||
if rh is None:
|
||||
log.info("Herald: Not installed")
|
||||
elif herald_cfg is None:
|
||||
log.warning("Herald: Not configured")
|
||||
elif not herald_cfg["enabled"]:
|
||||
log.info("Herald: Disabled")
|
||||
elif herald_cfg["mode"] == "local":
|
||||
log.info("Herald: Enabled (local server)")
|
||||
|
||||
def herald_constructor() -> multiprocessing.Process:
|
||||
# Create a Herald server
|
||||
herald_server = rh.Server(rh.Config.from_config(name="<server>", **config["Herald"]["Local"]))
|
||||
herald_server = rh.Server(rh.Config.from_config(name="<server>", **herald_cfg))
|
||||
# Run the Herald server on a new process
|
||||
herald_process = multiprocessing.Process(name="Herald.Local",
|
||||
return multiprocessing.Process(
|
||||
name="Herald.Local",
|
||||
target=herald_server.run_blocking,
|
||||
daemon=True,
|
||||
kwargs={
|
||||
"logging_cfg": config["Logging"]
|
||||
})
|
||||
herald_process.start()
|
||||
herald_cfg = config["Herald"]["Local"]
|
||||
log.info("Herald: Enabled (Local)")
|
||||
elif "Remote" in config["Herald"] and config["Herald"]["Remote"]["enabled"]:
|
||||
log.info("Herald: Enabled (Remote)")
|
||||
herald_cfg = config["Herald"]["Remote"]
|
||||
}
|
||||
)
|
||||
|
||||
processes["Herald"] = ru.RoyalnetProcess(herald_constructor, None)
|
||||
elif herald_cfg["mode"] == "remote":
|
||||
log.info("Herald: Enabled (remote server)")
|
||||
else:
|
||||
log.info("Herald: Disabled")
|
||||
else:
|
||||
log.info("Herald: Disabled")
|
||||
log.error(f"Invalid Herald mode: {herald_cfg['mode']}")
|
||||
|
||||
# Serfs
|
||||
telegram_process = None
|
||||
if rst is not None and "Telegram" in config["Serfs"] and config["Serfs"]["Telegram"]["enabled"]:
|
||||
telegram_process = multiprocessing.Process(name="Serf.Telegram",
|
||||
target=rst.TelegramSerf.run_process,
|
||||
daemon=True,
|
||||
kwargs={
|
||||
"alchemy_cfg": config["Alchemy"],
|
||||
"herald_cfg": herald_cfg,
|
||||
"packs_cfg": config["Packs"],
|
||||
"sentry_cfg": config["Sentry"],
|
||||
"logging_cfg": config["Logging"],
|
||||
"serf_cfg": config["Serfs"]["Telegram"],
|
||||
})
|
||||
telegram_process.start()
|
||||
log.info("Serf.Telegram: Started")
|
||||
serfs_cfg = config.get("Serfs")
|
||||
if serfs_cfg is None:
|
||||
log.warning("__serfs__: Not configured")
|
||||
else:
|
||||
log.info("Serf.Telegram: Disabled")
|
||||
log.debug("__serfs__: Configured")
|
||||
|
||||
discord_process = None
|
||||
if rsd is not None and "Discord" in config["Serfs"] and config["Serfs"]["Discord"]["enabled"]:
|
||||
discord_process = multiprocessing.Process(name="Serf.Discord",
|
||||
target=rsd.DiscordSerf.run_process,
|
||||
def configure_serf(name: str, module, class_: Type[rs.Serf]):
|
||||
serf_cfg = serfs_cfg.get(name)
|
||||
if module is None:
|
||||
log.info(f"Serf.{name}: Not installed")
|
||||
elif serf_cfg is None:
|
||||
log.warning(f"Serf.{name}: Not configured")
|
||||
elif not serf_cfg["enabled"]:
|
||||
log.info(f"Serf.{name}: Disabled")
|
||||
else:
|
||||
def serf_constructor() -> multiprocessing.Process:
|
||||
return multiprocessing.Process(
|
||||
name=f"Serf.{name}",
|
||||
target=class_.run_process,
|
||||
daemon=True,
|
||||
kwargs={
|
||||
"alchemy_cfg": config["Alchemy"],
|
||||
|
|
@ -112,35 +121,28 @@ def run(config_filename: str):
|
|||
"packs_cfg": config["Packs"],
|
||||
"sentry_cfg": config["Sentry"],
|
||||
"logging_cfg": config["Logging"],
|
||||
"serf_cfg": config["Serfs"]["Discord"],
|
||||
})
|
||||
discord_process.start()
|
||||
log.info("Serf.Discord: Started")
|
||||
else:
|
||||
log.info("Serf.Discord: Disabled")
|
||||
"serf_cfg": serf_cfg,
|
||||
}
|
||||
)
|
||||
processes[f"Serf.{name}"] = ru.RoyalnetProcess(serf_constructor, None)
|
||||
log.info(f"Serf.{name}: Enabled")
|
||||
|
||||
matrix_process = None
|
||||
if rsm is not None and "Matrix" in config["Serfs"] and config["Serfs"]["Matrix"]["enabled"]:
|
||||
matrix_process = multiprocessing.Process(name="Serf.Matrix",
|
||||
target=rsm.MatrixSerf.run_process,
|
||||
daemon=True,
|
||||
kwargs={
|
||||
"alchemy_cfg": config["Alchemy"],
|
||||
"herald_cfg": herald_cfg,
|
||||
"packs_cfg": config["Packs"],
|
||||
"sentry_cfg": config["Sentry"],
|
||||
"logging_cfg": config["Logging"],
|
||||
"serf_cfg": config["Serfs"]["Matrix"],
|
||||
})
|
||||
matrix_process.start()
|
||||
log.info("Serf.Matrix: Started")
|
||||
else:
|
||||
log.info("Serf.Matrix: Disabled")
|
||||
configure_serf("Telegram", rst, rst.TelegramSerf)
|
||||
configure_serf("Discord", rsd, rsd.DiscordSerf)
|
||||
configure_serf("Matrix", rsm, rsm.MatrixSerf)
|
||||
|
||||
# Constellation
|
||||
constellation_process = None
|
||||
if rc is not None and "Constellation" in config and config["Constellation"]["enabled"]:
|
||||
constellation_process = multiprocessing.Process(name="Constellation",
|
||||
constellation_cfg = config.get("Constellation")
|
||||
if rc is None:
|
||||
log.info(f"Constellation: Not installed")
|
||||
elif constellation_cfg is None:
|
||||
log.warning(f"Constellation: Not configured")
|
||||
elif not constellation_cfg["enabled"]:
|
||||
log.info(f"Constellation: Disabled")
|
||||
else:
|
||||
def constellation_constructor() -> multiprocessing.Process:
|
||||
return multiprocessing.Process(
|
||||
name="Constellation",
|
||||
target=rc.Constellation.run_process,
|
||||
daemon=True,
|
||||
kwargs={
|
||||
|
|
@ -150,29 +152,33 @@ def run(config_filename: str):
|
|||
"sentry_cfg": config["Sentry"],
|
||||
"logging_cfg": config["Logging"],
|
||||
"constellation_cfg": config["Constellation"],
|
||||
})
|
||||
constellation_process.start()
|
||||
log.info("Constellation: Started")
|
||||
else:
|
||||
log.info("Constellation: Disabled")
|
||||
}
|
||||
)
|
||||
processes["Constellation"] = ru.RoyalnetProcess(constellation_constructor, None)
|
||||
|
||||
log.info("All processes started!")
|
||||
if constellation_process is not None:
|
||||
log.info("Waiting for Constellation to stop...")
|
||||
constellation_process.join()
|
||||
if telegram_process is not None:
|
||||
log.info("Waiting for Serf.Telegram to stop...")
|
||||
telegram_process.join()
|
||||
if discord_process is not None:
|
||||
log.info("Waiting for Serf.Discord to stop...")
|
||||
discord_process.join()
|
||||
if matrix_process is not None:
|
||||
log.info("Waiting for Serf.Matrix to stop...")
|
||||
matrix_process.join()
|
||||
if herald_process is not None:
|
||||
log.info("Waiting for Herald to stop...")
|
||||
herald_process.join()
|
||||
log.info("Constellation: Enabled")
|
||||
|
||||
try:
|
||||
# Monitor processes
|
||||
while True:
|
||||
log.debug("Checking process status...")
|
||||
for name, process in processes.items():
|
||||
if process.current_process is None:
|
||||
log.info(f"{name}: Starting...")
|
||||
process.current_process = process.constructor()
|
||||
process.current_process.start()
|
||||
elif not process.current_process.is_alive():
|
||||
log.error(f"{name}: Process is dead, restarting...")
|
||||
process.current_process = process.constructor()
|
||||
process.current_process.start()
|
||||
log.debug("Done, checking again in 60 seconds.")
|
||||
time.sleep(60)
|
||||
except KeyboardInterrupt:
|
||||
log.info("Received SIGTERM, stopping everything!")
|
||||
for name, process in processes.items():
|
||||
log.info(f"{name}: Killing...")
|
||||
process.current_process.kill()
|
||||
log.info("Goodbye!")
|
||||
|
||||
if __name__ == "__main__":
|
||||
run()
|
||||
|
|
|
|||
|
|
@ -53,14 +53,15 @@ class Config:
|
|||
return f"<HeraldConfig for {self.url}>"
|
||||
|
||||
@classmethod
|
||||
def from_config(cls, *,
|
||||
def from_config(
|
||||
cls, *,
|
||||
name: str,
|
||||
address: str,
|
||||
port: int,
|
||||
secret: str,
|
||||
secure: bool = False,
|
||||
path: str = "/",
|
||||
enabled: ... = ...
|
||||
**_,
|
||||
):
|
||||
return cls(
|
||||
name=name,
|
||||
|
|
|
|||
|
|
@ -10,12 +10,8 @@ Install it with: ::
|
|||
|
||||
from .discordserf import DiscordSerf
|
||||
from .escape import escape
|
||||
from .playable import Playable
|
||||
from .voiceplayer import VoicePlayer
|
||||
|
||||
__all__ = [
|
||||
"escape",
|
||||
"DiscordSerf",
|
||||
"Playable",
|
||||
"VoicePlayer",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from .sleep_until import sleep_until
|
|||
from .strip_tabs import strip_tabs
|
||||
from .taskslist import TaskList
|
||||
from .urluuid import to_urluuid, from_urluuid
|
||||
from .royalnetprocess import RoyalnetProcess
|
||||
|
||||
__all__ = [
|
||||
"asyncify",
|
||||
|
|
@ -28,4 +29,5 @@ __all__ = [
|
|||
"JSON",
|
||||
"strip_tabs",
|
||||
"TaskList",
|
||||
"RoyalnetProcess",
|
||||
]
|
||||
|
|
|
|||
9
royalnet/utils/royalnetprocess.py
Normal file
9
royalnet/utils/royalnetprocess.py
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
from typing import *
|
||||
import dataclasses
|
||||
import multiprocessing
|
||||
|
||||
|
||||
@dataclasses.dataclass()
|
||||
class RoyalnetProcess:
|
||||
constructor: Callable[[], multiprocessing.Process]
|
||||
current_process: Optional[multiprocessing.Process]
|
||||
Loading…
Reference in a new issue