liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt some

Browse Source
This commit is contained in:
shaoying 2020-08-29 16:30:42 +08:00
parent b3d67dacfc
commit 85f6bc392b
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/code/install.go
View File

@ -86,7 +86,7 @@ func init() {
target := path.Join(m.Conf(cli.DAEMON, kit.META_PATH), port) target := path.Join(m.Conf(cli.DAEMON, kit.META_PATH), port)
source := path.Join(m.Conf(INSTALL, kit.META_PATH), kit.TrimExt(arg[0])) source := path.Join(m.Conf(INSTALL, kit.META_PATH), kit.TrimExt(arg[0]))
m.Cmd(nfs.DIR, path.Join(source, INSTALL)).Table(func(index int, value map[string]string, head []string) { m.Cmd(nfs.DIR, path.Join(source, kit.Select("install", m.Option("install")))).Table(func(index int, value map[string]string, head []string) {
m.Cmd(cli.SYSTEM, "cp", "-r", strings.TrimSuffix(value[kit.MDB_PATH], "/"), target) m.Cmd(cli.SYSTEM, "cp", "-r", strings.TrimSuffix(value[kit.MDB_PATH], "/"), target)
}) })
m.Echo(target) m.Echo(target)

30
misc/es/es.go
View File

@ -2,7 +2,6 @@ package es
import ( import (
ice "github.com/shylinux/icebergs" ice "github.com/shylinux/icebergs"
"github.com/shylinux/icebergs/base/cli"
"github.com/shylinux/icebergs/base/web" "github.com/shylinux/icebergs/base/web"
"github.com/shylinux/icebergs/core/code" "github.com/shylinux/icebergs/core/code"
kit "github.com/shylinux/toolkits" kit "github.com/shylinux/toolkits"
@ -27,34 +26,21 @@ var Index = &ice.Context{Name: ES, Help: "搜索",
ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {}}, ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {}},
ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {}}, ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {}},
ES: {Name: "es hash=auto auto 启动:button 安装:button", Help: "搜索", Action: map[string]*ice.Action{ ES: {Name: "es port=auto path=auto auto 启动:button 下载", Help: "搜索", Action: map[string]*ice.Action{
"download": {Name: "download", Help: "安装", Hand: func(m *ice.Message, arg ...string) { "download": {Name: "download", Help: "下载", Hand: func(m *ice.Message, arg ...string) {
m.Cmdy("web.code.install", "download", m.Conf(ES, kit.Keys(kit.MDB_META, runtime.GOOS))) m.Cmdy(code.INSTALL, "download", m.Conf(ES, kit.Keys(kit.MDB_META, runtime.GOOS)))
}}, }},
"start": {Name: "start", Help: "启动", Hand: func(m *ice.Message, arg ...string) { "start": {Name: "start", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
m.Option("install", ".")
name := path.Base(m.Conf(ES, kit.Keys(kit.MDB_META, runtime.GOOS))) name := path.Base(m.Conf(ES, kit.Keys(kit.MDB_META, runtime.GOOS)))
name = strings.Join(strings.Split(name, "-")[:2], "-") name = strings.Join(strings.Split(name, "-")[:2], "-")
m.Cmdy("web.code.install", "start", name, "bin/elasticsearch") m.Cmdy(code.INSTALL, "start", name, "bin/elasticsearch")
}}, }},
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
if len(arg) == 0 { name := path.Base(m.Conf(ES, kit.Keys(kit.MDB_META, runtime.GOOS)))
m.Cmd(cli.DAEMON).Table(func(index int, value map[string]string, head []string) { name = strings.Join(strings.Split(name, "-")[:2], "-")
if strings.HasPrefix(value["name"], "bin/elasticsearch") { m.Cmdy(code.INSTALL, name, arg)
m.Push("time", value["time"])
m.Push("hash", value["hash"])
m.Push("status", value["status"])
m.Push("pid", value["pid"])
m.Push("name", value["name"])
m.Push("dir", value["dir"])
}
})
return
}
m.Richs(cli.DAEMON, "", arg[0], func(key string, value map[string]interface{}) {
m.Cmdy(web.SPIDE, web.SPIDE_DEV, web.SPIDE_RAW, web.SPIDE_GET, m.Conf(ES, "meta.address"))
})
}}, }},
"GET": {Name: "GET 查看:button cmd:text=/", Help: "命令", Action: map[string]*ice.Action{}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { "GET": {Name: "GET 查看:button cmd:text=/", Help: "命令", Action: map[string]*ice.Action{}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {