From a363479fb0a1e95fcf3bdba23fab87213afaccb6 Mon Sep 17 00:00:00 2001 From: capone212 Date: Mon, 9 May 2016 13:35:19 +0300 Subject: [PATCH 1/4] Added consul script check support for raw_exec driver --- client/driver/executor/executor.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index ce36c5e4e..78a44c5eb 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -586,6 +586,20 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str }, nil } + + if check.Type == structs.ServiceCheckScript && e.ctx.Driver == "raw_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 + + } + return nil, fmt.Errorf("couldn't create check for %v", check.Name) } From 2a4bea364c5edbc73fcf66355829709f43f1ec7b Mon Sep 17 00:00:00 2001 From: capone212 Date: Mon, 9 May 2016 17:22:01 +0300 Subject: [PATCH 2/4] 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, From 23c5b584a4633e9736c492b1a2bf76994f36ed72 Mon Sep 17 00:00:00 2001 From: capone212 Date: Mon, 9 May 2016 17:23:38 +0300 Subject: [PATCH 3/4] Reverted blank line --- client/driver/executor/executor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index c90f8c787..1e06b8d1f 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -586,7 +586,6 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str }, nil } - return nil, fmt.Errorf("couldn't create check for %v", check.Name) } From e616e5446d8d4943f3cf67b3a7e994e76ef162f4 Mon Sep 17 00:00:00 2001 From: capone212 Date: Mon, 9 May 2016 17:27:01 +0300 Subject: [PATCH 4/4] Added java --- client/driver/executor/executor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index 1e06b8d1f..7e4791655 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -574,7 +574,8 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str }, nil } - if check.Type == structs.ServiceCheckScript && (e.ctx.Driver == "exec" || e.ctx.Driver == "raw_exec") { + if check.Type == structs.ServiceCheckScript && (e.ctx.Driver == "exec" || + e.ctx.Driver == "raw_exec" || e.ctx.Driver == "java") { return &ExecScriptCheck{ id: checkID, interval: check.Interval,