extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-03 16:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

daemon/job: fix buildJob returning nil error on job uild error

Browse Source 
Would show up as ugly nil-pointer-deref panic later during daemon
startup
This commit is contained in:
Christian Schwarz 2018-10-18 16:18:53 +02:00
parent 6fcf0635a5
commit a5376913fd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/job/build_jobs.go
View File

@ -13,6 +13,9 @@ func JobsFromConfig(c *config.Config) ([]Job, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if j == nil || j.Name() == "" {
panic(fmt.Sprintf("implementation error: job builder returned nil job type %T", c.Jobs[i].Ret))
}
js[i] = j js[i] = j
} }
return js, nil return js, nil
@ -20,7 +23,7 @@ func JobsFromConfig(c *config.Config) ([]Job, error) {
func buildJob(c *config.Global, in config.JobEnum) (j Job, err error) { func buildJob(c *config.Global, in config.JobEnum) (j Job, err error) {
cannotBuildJob := func(e error, name string) (Job, error) { cannotBuildJob := func(e error, name string) (Job, error) {
return nil, errors.Wrapf(err, "cannot build job %q", name) return nil, errors.Wrapf(e, "cannot build job %q", name)
} }
// FIXME prettify this // FIXME prettify this
switch v := in.Ret.(type) { switch v := in.Ret.(type) {