diff --git a/base/web/spide.go b/base/web/spide.go index bf05e64d..5a99d5d6 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -68,14 +68,18 @@ func _spide_show(m *ice.Message, name string, arg ...string) { } defer res.Body.Close() m.Cost(cli.STATUS, res.Status, nfs.SIZE, kit.FmtSize(kit.Int64(res.Header.Get(html.ContentLength))), mdb.TYPE, res.Header.Get(html.ContentType)) - m.Push(mdb.TYPE, STATUS).Push(mdb.NAME, res.StatusCode).Push(mdb.VALUE, res.Status) + if action != SPIDE_RAW { + m.Push(mdb.TYPE, STATUS).Push(mdb.NAME, res.StatusCode).Push(mdb.VALUE, res.Status) + } m.Options(STATUS, res.Status) kit.For(res.Header, func(k string, v []string) { if m.Option(log.DEBUG) == ice.TRUE { m.Logs(RESPONSE, k, v) } m.Options(k, v) - m.Push(mdb.TYPE, SPIDE_HEADER).Push(mdb.NAME, k).Push(mdb.VALUE, v[0]) + if action != SPIDE_RAW { + m.Push(mdb.TYPE, SPIDE_HEADER).Push(mdb.NAME, k).Push(mdb.VALUE, v[0]) + } }) mdb.HashSelectUpdate(m, name, func(value ice.Map) { kit.For(res.Cookies(), func(v *http.Cookie) { @@ -83,7 +87,9 @@ func _spide_show(m *ice.Message, name string, arg ...string) { if m.Option(log.DEBUG) == ice.TRUE { m.Logs(RESPONSE, v.Name, v.Value) } - m.Push(mdb.TYPE, COOKIE).Push(mdb.NAME, v.Name).Push(mdb.VALUE, v.Value) + if action != SPIDE_RAW { + m.Push(mdb.TYPE, COOKIE).Push(mdb.NAME, v.Name).Push(mdb.VALUE, v.Value) + } }) }) if m.Warn(res.StatusCode != http.StatusOK && res.StatusCode != http.StatusCreated, ice.ErrNotValid, uri, cli.STATUS, res.Status) { diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 943d136e..1abea5c1 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -162,6 +162,8 @@ func (s relay) Dream(m *ice.Message) { s.foreach(m, func(msg *ice.Message, cmd []string) { m.Push("", kit.Dict(msg.OptionSimple(fields), mdb.TYPE, web.SERVER, mdb.STATUS, web.ONLINE, web.SPACE, ice.CONTEXTS, web.LINK, web.HostPort(m.Message, msg.Option(tcp.HOST), msg.Option(web.PORTAL))), kit.Split(fields)) ssh.CombinedOutput(msg.Message, s.admins(msg, web.ROUTE), func(res string) { + if strings.HasPrefix(res, "status") { + } _msg := m.Spawn().SplitIndex(res) m.Copy(_msg.Table(func(value ice.Maps) { switch _msg.Push(MACHINE, msg.Option(MACHINE)).Push(tcp.HOST, msg.Option(tcp.HOST)); msg.Option(web.PORTAL) {