From 2a4bea364c5edbc73fcf66355829709f43f1ec7b Mon Sep 17 00:00:00 2001 From: capone212 Date: Mon, 9 May 2016 17:22:01 +0300 Subject: [PATCH] Fixed CR defect --- client/driver/executor/executor.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index 78a44c5eb..c90f8c787 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -574,20 +574,7 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str }, nil } - if check.Type == structs.ServiceCheckScript && e.ctx.Driver == "exec" { - return &ExecScriptCheck{ - id: checkID, - interval: check.Interval, - timeout: check.Timeout, - cmd: check.Command, - args: check.Args, - taskDir: e.taskDir, - FSIsolation: e.command.FSIsolation, - }, nil - - } - - if check.Type == structs.ServiceCheckScript && e.ctx.Driver == "raw_exec" { + if check.Type == structs.ServiceCheckScript && (e.ctx.Driver == "exec" || e.ctx.Driver == "raw_exec") { return &ExecScriptCheck{ id: checkID, interval: check.Interval,