diff options
Diffstat (limited to 'worker.go')
| -rw-r--r-- | worker.go | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -22,12 +22,12 @@ type worker struct { Reports Reports } -func newWorker(opts ServerOptions) (wrk *worker, err error) { +func newWorker(cfg ServerConfig) (wrk *worker, err error) { wrk = &worker{ Services: make(map[string]*Service), } - err = wrk.loadServiceDir(opts) + err = wrk.loadServiceDir(cfg) if err != nil { return nil, err } @@ -36,7 +36,7 @@ func newWorker(opts ServerOptions) (wrk *worker, err error) { Services: make(map[string]*ServiceReport, len(wrk.Services)), } for name := range wrk.Services { - wrk.Reports.Services[name], err = NewServiceReport(opts, name) + wrk.Reports.Services[name], err = NewServiceReport(cfg, name) if err != nil { return nil, err } @@ -45,13 +45,13 @@ func newWorker(opts ServerOptions) (wrk *worker, err error) { } type serviceConfigs struct { - Options map[string]ServiceOptions `ini:"service"` + Config map[string]ServiceConfig `ini:"service"` } // loadServiceDir Load all the service configurations. -func (wrk *worker) loadServiceDir(opts ServerOptions) (err error) { +func (wrk *worker) loadServiceDir(cfg ServerConfig) (err error) { var listde []os.DirEntry - listde, err = os.ReadDir(opts.configServiceDir) + listde, err = os.ReadDir(cfg.configServiceDir) if err != nil { return err } @@ -71,7 +71,7 @@ func (wrk *worker) loadServiceDir(opts ServerOptions) (err error) { continue } - var serviceCfg = filepath.Join(opts.configServiceDir, name) + var serviceCfg = filepath.Join(cfg.configServiceDir, name) var rawcfg []byte rawcfg, err = os.ReadFile(serviceCfg) @@ -85,9 +85,9 @@ func (wrk *worker) loadServiceDir(opts ServerOptions) (err error) { } } var svc *Service - for name, svcOpts := range svcConfigs.Options { - svcOpts.Name = name - svc, err = NewService(svcOpts) + for name, svcConfig := range svcConfigs.Config { + svcConfig.Name = name + svc, err = NewService(svcConfig) if err != nil { return err } |