From 7f641ebe1e72b776fed44fe169a8e19952a326a0 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Fri, 10 Sep 2021 19:45:31 +0200 Subject: [PATCH] Fix: Initialize core plugins after main components are set up Signed-off-by: Knut Ahlers --- action_core.go | 7 +++++-- main.go | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/action_core.go b/action_core.go index db2eb10..17c7cd8 100644 --- a/action_core.go +++ b/action_core.go @@ -6,6 +6,7 @@ import ( "github.com/Luzifer/twitch-bot/internal/actors/ban" "github.com/Luzifer/twitch-bot/internal/actors/delay" deleteactor "github.com/Luzifer/twitch-bot/internal/actors/delete" + "github.com/Luzifer/twitch-bot/internal/actors/modchannel" "github.com/Luzifer/twitch-bot/internal/actors/raw" "github.com/Luzifer/twitch-bot/internal/actors/respond" "github.com/Luzifer/twitch-bot/internal/actors/timeout" @@ -20,19 +21,21 @@ var coreActorRegistations = []plugins.RegisterFunc{ ban.Register, delay.Register, deleteactor.Register, + modchannel.Register, raw.Register, respond.Register, timeout.Register, whisper.Register, } -func init() { +func initCorePlugins() error { args := getRegistrationArguments() for _, rf := range coreActorRegistations { if err := rf(args); err != nil { - log.WithError(err).Fatal("Unable to register core actor") + return errors.Wrap(err, "registering core plugin") } } + return nil } func registerRoute(route plugins.HTTPRouteRegistrationArgs) error { diff --git a/main.go b/main.go index 2611c68..e35e49e 100644 --- a/main.go +++ b/main.go @@ -89,6 +89,10 @@ func main() { router.HandleFunc("/", handleSwaggerHTML) router.HandleFunc("/openapi.json", handleSwaggerRequest) + if err = initCorePlugins(); err != nil { + log.WithError(err).Fatal("Unable to load core plugins") + } + if err = loadPlugins(cfg.PluginDir); err != nil { log.WithError(err).Fatal("Unable to load plugins") }