fix(task/cron): use the correct pointer to build structure
feat(init): included enviroment variable and working directory test(cron): wip
This commit is contained in:
23
task/cron.go
23
task/cron.go
@@ -4,9 +4,10 @@ import (
|
||||
"crypto/sha256"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"gitea.suyono.dev/suyono/wingmate"
|
||||
"time"
|
||||
|
||||
"gitea.suyono.dev/suyono/wingmate"
|
||||
|
||||
wminit "gitea.suyono.dev/suyono/wingmate/init"
|
||||
)
|
||||
|
||||
@@ -154,14 +155,14 @@ func (c *CronTask) Equals(another *CronTask) bool {
|
||||
|
||||
cmpStruct := func(p *CronTask) ([]byte, error) {
|
||||
s := &toCompare{
|
||||
Name: c.Name(),
|
||||
Command: c.Command(),
|
||||
Arguments: c.Arguments(),
|
||||
Environ: c.Environ(),
|
||||
Setsid: c.Setsid(),
|
||||
UserGroup: c.UserGroup().String(),
|
||||
WorkingDir: c.WorkingDir(),
|
||||
Schedule: c.cronScheduleString,
|
||||
Name: p.Name(),
|
||||
Command: p.Command(),
|
||||
Arguments: p.Arguments(),
|
||||
Environ: p.Environ(),
|
||||
Setsid: p.Setsid(),
|
||||
UserGroup: p.UserGroup().String(),
|
||||
WorkingDir: p.WorkingDir(),
|
||||
Schedule: p.cronScheduleString,
|
||||
}
|
||||
|
||||
return json.Marshal(s)
|
||||
@@ -238,6 +239,10 @@ func (c *CronTask) Arguments() []string {
|
||||
return retval
|
||||
}
|
||||
|
||||
func (c *CronTask) EnvLen() int {
|
||||
return len(c.environ)
|
||||
}
|
||||
|
||||
func (c *CronTask) Environ() []string {
|
||||
retval := make([]string, len(c.environ))
|
||||
copy(retval, c.environ)
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"crypto/sha256"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"gitea.suyono.dev/suyono/wingmate"
|
||||
|
||||
wminit "gitea.suyono.dev/suyono/wingmate/init"
|
||||
@@ -293,6 +294,10 @@ func (t *ServiceTask) Arguments() []string {
|
||||
return retval
|
||||
}
|
||||
|
||||
func (t *ServiceTask) EnvLen() int {
|
||||
return len(t.environ)
|
||||
}
|
||||
|
||||
func (t *ServiceTask) Environ() []string {
|
||||
retval := make([]string, len(t.environ))
|
||||
copy(retval, t.environ)
|
||||
|
||||
Reference in New Issue
Block a user