From 698230ff8ef963d8fc3bc0c13989014b9cf61820 Mon Sep 17 00:00:00 2001 From: James Nesbitt Date: Fri, 30 Oct 2015 13:46:45 +0200 Subject: [PATCH] tool operation cleanup --- operation_help.go | 4 ++++ tools.go | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/operation_help.go b/operation_help.go index e7fb82f..f2156ac 100644 --- a/operation_help.go +++ b/operation_help.go @@ -43,6 +43,10 @@ OPERATIONS: unpause remove + scale + + tool + The first topic passed in is assumed to be a help operation. `) } diff --git a/tools.go b/tools.go index 2ce3ed4..9552bd4 100644 --- a/tools.go +++ b/tools.go @@ -31,7 +31,7 @@ func (tools Tools) GetToolsFromYaml(conf *Conf, log Log, source []byte, overwrit } tool.conf = conf - tool.log = log + tool.log = log.ChildLog("SCRIPT") if exists:=tools[name]; exists==nil || overwrite { tools[name] = Tool(&tool) @@ -59,15 +59,14 @@ type Tool_Script struct { } func (tool *Tool_Script) Run(flags []string) bool { -tool.log.DebugObject( LOG_SEVERITY_MESSAGE, "TOOL SCRIPT", tool.Script) - -// tool.Script = []string{"ps", "-aux"} - cmd_first := tool.Script[0] args := []string{} if len(tool.Script)>1 { args = tool.Script[1:] } + if len(flags)>0 { + args = append(args, flags...) + } if path.IsAbs(cmd_first) { @@ -90,15 +89,15 @@ tool.log.DebugObject( LOG_SEVERITY_MESSAGE, "TOOL SCRIPT", tool.Script) cmd.Env = append(cmd.Env, tool.Env...) } - tool.log.Message("Running Script") + tool.log.Message("RUN: "+cmd_first) err := cmd.Start() if err!=nil { - tool.log.Error("SCRIPT FAILED => "+err.Error()) + tool.log.Error("FAILED => "+err.Error()) return false } - tool.log.Message("SCRIPT RUN") err = cmd.Wait() + tool.log.Message("FINISHED") return err==nil }