WIP: added fallback env
This commit is contained in:
@@ -32,7 +32,7 @@ func convert(cfg *config.Config) *wConfig {
|
||||
|
||||
for _, s := range cfg.Service {
|
||||
st := task.NewServiceTask(s.Name).SetCommand(s.Command...).SetEnv(s.Environ...)
|
||||
st.SetFlagSetsid(s.Setsid).SetWorkingDir(s.WorkingDir)
|
||||
st.SetFallbackEnv(s.FallbackEnv...).SetFlagSetsid(s.Setsid).SetWorkingDir(s.WorkingDir)
|
||||
st.SetUser(s.User).SetGroup(s.Group).SetStartSecs(s.StartSecs).SetPidFile(s.PidFile)
|
||||
st.SetConfig(cfg)
|
||||
retval.tasks.AddService(st)
|
||||
@@ -52,7 +52,8 @@ func convert(cfg *config.Config) *wConfig {
|
||||
schedule = configToTaskCronSchedule(c.CronSchedule)
|
||||
|
||||
ct := task.NewCronTask(c.Name).SetCommand(c.Command...).SetEnv(c.Environ...)
|
||||
ct.SetFlagSetsid(c.Setsid).SetWorkingDir(c.WorkingDir).SetUser(c.User).SetGroup(c.Group)
|
||||
ct.SetFallbackEnv(c.FallbackEnv...).SetFlagSetsid(c.Setsid).SetWorkingDir(c.WorkingDir)
|
||||
ct.SetUser(c.User).SetGroup(c.Group)
|
||||
ct.SetSchedule(c.Schedule, schedule)
|
||||
ct.SetConfig(cfg)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user