cli/cli: Fix panic on module access

foxcpp · foxcpp · commit 95ba6bf1fc71 · 2025-01-30T03:52:41.000+03:00
diff --git a/internal/cli/ctl/moduleinit.go b/internal/cli/ctl/moduleinit.go
@@ -44,6 +44,7 @@ func getCfgBlockModule(ctx *cli.Context) (*container.C, module.Module, error) {
 	}
 
 	c := container.New()
+	container.Global = c
 
 	cfg, err := maddy.ReadConfig(cfgPath)
 	if err != nil {
diff --git a/internal/table/sql_query.go b/internal/table/sql_query.go
@@ -133,11 +133,11 @@ func (s *SQL) Configure(inlineArgs []string, cfg *config.Map) error {
 		return nil
 	}
 
-	return nil
+	return s.prepare()
 }
 
 func (s *SQL) Start() error {
-	return s.prepare()
+	return nil
 }
 
 func (s *SQL) Stop() error {

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func getCfgBlockModule(ctx cli.Context) (container.C, module.Module, error) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`c := container.New()`
	`47`	`+ container.Global = c`
`47`	`48`
`48`	`49`	`cfg, err := maddy.ReadConfig(cfgPath)`
`49`	`50`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,11 @@ func (s SQL) Configure(inlineArgs []string, cfg config.Map) error {`
`133`	`133`	`return nil`
`134`	`134`	`}`
`135`	`135`
`136`		`- return nil`
	`136`	`+ return s.prepare()`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func (s *SQL) Start() error {`
`140`		`- return s.prepare()`
	`140`	`+ return nil`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`func (s *SQL) Stop() error {`