diff --git a/bin/boot.sh b/bin/boot.sh index 348c30cc..6c377052 100755 --- a/bin/boot.sh +++ b/bin/boot.sh @@ -64,7 +64,7 @@ main() { trap HUP hup log "\nstarting..." while true; do - date && ${ctx_bin} "$@" 2>${ctx_err} && break + date && ${ctx_bin} "$@" 2>>${ctx_err} && break log "\n\nrestarting..." && sleep 1 done } diff --git a/src/contexts/ctx/type.go b/src/contexts/ctx/type.go index 8d0b91ba..8d707221 100644 --- a/src/contexts/ctx/type.go +++ b/src/contexts/ctx/type.go @@ -147,6 +147,9 @@ func (m *Message) Detail(arg ...interface{}) string { return m.Insert("detail", index, arg...) } func (m *Message) Option(key string, arg ...interface{}) string { + if m == nil { + return "" + } if len(arg) > 0 { m.Insert(key, 0, arg...) if _, ok := m.Meta[key]; ok { diff --git a/src/contexts/ssh/ssh.go b/src/contexts/ssh/ssh.go index dd23c728..8afae332 100644 --- a/src/contexts/ssh/ssh.go +++ b/src/contexts/ssh/ssh.go @@ -350,6 +350,12 @@ var Index = &ctx.Context{Name: "ssh", Help: "集群中心", msg.Option("river", arg[3]) msg.Option("storm", arg[1]) + kit.Map(tool["inputs"], "", func(index int, value map[string]interface{}) { + if name := kit.Format(value["name"]); name != "" { + m.Log("info", "%v: %v", name, m.Option(name)) + msg.Option(name, m.Option(name)) + } + }) arg = arg[4:] if len(prefix) > 0 && prefix[1] == "_" {