From 2d3cd6584dedce45ea709d1757a28ce7537f3472 Mon Sep 17 00:00:00 2001 From: Philipp Tanlak Date: Mon, 30 Oct 2023 19:02:50 +0100 Subject: Refactor to prepare for builtin JS functions --- module.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module.go') diff --git a/module.go b/module.go index 0540c91..9b33de4 100644 --- a/module.go +++ b/module.go @@ -54,11 +54,12 @@ func RegisterModule(mod Module) { modules[mod.ModuleInfo().ID] = mod } -func LoadModules(s *Scraper, cfg Config) { +func LoadModules(cfg Config) []Module { modulesMu.RLock() defer modulesMu.RUnlock() loaded := map[string]struct{}{} + mods := []Module{} // load standard modules in order for _, id := range moduleOrder { @@ -66,7 +67,7 @@ func LoadModules(s *Scraper, cfg Config) { if err := json.Unmarshal(cfg, mod); err != nil { panic("failed to decode config: " + err.Error()) } - s.LoadModule(mod) + mods = append(mods, mod) loaded[id] = struct{}{} } @@ -79,9 +80,11 @@ func LoadModules(s *Scraper, cfg Config) { if err := json.Unmarshal(cfg, mod); err != nil { panic("failed to decode config: " + err.Error()) } - s.LoadModule(mod) + mods = append(mods, mod) loaded[id] = struct{}{} } + + return mods } var ( -- cgit v1.2.3