kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 17:35:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

client: Merge driver/shared/structs and client/structs

Browse Source
This commit is contained in:
Danielle Tomlinson
2018-11-30 10:56:45 +01:00
parent 9d4329b57a
commit 756325bcbd
8 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/shared/executor/executor_linux.go
View File

@@ -19,7 +19,6 @@ import (
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/nomad/client/stats"
cstructs "github.com/hashicorp/nomad/client/structs"
dstructs "github.com/hashicorp/nomad/drivers/shared/structs"
"github.com/hashicorp/nomad/helper/discover"
shelpers "github.com/hashicorp/nomad/helper/stats"
"github.com/hashicorp/nomad/helper/uuid"
@@ -403,7 +402,7 @@ func (l *LibcontainerExecutor) Signal(s os.Signal) error {
func (l *LibcontainerExecutor) Exec(deadline time.Time, cmd string, args []string) ([]byte, int, error) {
combined := append([]string{cmd}, args...)
// Capture output
buf, _ := circbuf.NewBuffer(int64(dstructs.CheckBufSize))
buf, _ := circbuf.NewBuffer(int64(cstructs.CheckBufSize))
process := &libcontainer.Process{
Args: combined,