From 2450d193f34b819e4c58f6ad35f57c19e8b8c0a4 Mon Sep 17 00:00:00 2001
From: ouqiang <qingqianludao@gmail.com>
Date: Fri, 7 Apr 2017 19:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dansible=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/web.go                 | 1 -
 modules/ansible/ansible.go | 1 -
 routers/host/host.go       | 3 +++
 service/task.go            | 2 +-
 templates/task/create.html | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/web.go b/cmd/web.go
index 4a5b128..2895614 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -14,7 +14,6 @@ import (
     "os/exec"
     "syscall"
     "github.com/ouqiang/gocron/modules/logger"
-    "fmt"
 )
 
 // 1号进程id
diff --git a/modules/ansible/ansible.go b/modules/ansible/ansible.go
index e222722..c1ba63f 100644
--- a/modules/ansible/ansible.go
+++ b/modules/ansible/ansible.go
@@ -32,7 +32,6 @@ func ExecCommand(hosts string, hostFile string, module string, args ...string) (
     if len(args) > 0 {
         commandArgs = append(commandArgs, args...)
     }
-    logger.Info(commandArgs)
     output, err = utils.ExecShell("ansible", commandArgs...)
 
     return
diff --git a/routers/host/host.go b/routers/host/host.go
index 265e90a..5aabebd 100644
--- a/routers/host/host.go
+++ b/routers/host/host.go
@@ -5,6 +5,7 @@ import (
     "github.com/ouqiang/gocron/models"
     "github.com/ouqiang/gocron/modules/utils"
     "github.com/ouqiang/gocron/modules/logger"
+    "github.com/ouqiang/gocron/modules/ansible"
 )
 
 func Create(ctx *macaron.Context)  {
@@ -38,5 +39,7 @@ func Store(ctx *macaron.Context, form HostForm) string  {
         return json.Failure(utils.ResponseFailure, "保存失败")
     }
 
+    ansible.DefaultHosts.Write()
+
     return json.Success("保存成功", nil)
 }
\ No newline at end of file
diff --git a/service/task.go b/service/task.go
index 3fcefac..8f33961 100644
--- a/service/task.go
+++ b/service/task.go
@@ -105,7 +105,7 @@ func (ssh *SSHScriptHandler) Run(taskModel models.Task) (string, error) {
 
 // SSH任务
 func execSSHHandler(module string, taskModel models.Task) (string, error) {
-    var args []string = []string{"-a", "'" + taskModel.Command + "'"}
+    var args []string = []string{"-a", taskModel.Command}
     if taskModel.Timeout > 0 {
         // -B 异步执行超时时间, -P 轮询时间
         args = append(args, "-B", strconv.Itoa(taskModel.Timeout), "-P", "10")
diff --git a/templates/task/create.html b/templates/task/create.html
index 8b2030b..21edea5 100644
--- a/templates/task/create.html
+++ b/templates/task/create.html
@@ -64,7 +64,7 @@
                 {{{range $i, $v := .Hosts}}}
                 <div class="field">
                     <div class="ui checkbox">
-                        <input type="checkbox" name="hosts[]" tabindex="0" class="hidden" value="{{{.Alias}}}">
+                        <input type="checkbox" name="hosts[]" tabindex="0" class="hidden" value="{{{.Id}}}">
                         <label>{{{.Alias}}}-{{{.Name}}}</label>
                     </div>
                 </div>