From 2c28b22f67ffb826c3f3dca55ece206dae5225d4 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Tue, 4 Sep 2018 19:21:52 +0800 Subject: [PATCH] - remove unused code - add rpm build files --- .../root/etc/yunion/webconsole.conf.sample | 11 ++++++++++ build/webconsole/vars | 1 + pkg/webconsole/server/tty_server.go | 22 ------------------- 3 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 build/webconsole/root/etc/yunion/webconsole.conf.sample create mode 100644 build/webconsole/vars diff --git a/build/webconsole/root/etc/yunion/webconsole.conf.sample b/build/webconsole/root/etc/yunion/webconsole.conf.sample new file mode 100644 index 0000000000..412382fdd3 --- /dev/null +++ b/build/webconsole/root/etc/yunion/webconsole.conf.sample @@ -0,0 +1,11 @@ +region = 'LzxHQ' +address = '10.168.222.245' +port = 8899 +auth_uri = 'http://10.168.222.245:35357/v3' +admin_user = 'regionadmin' +admin_password = 'iygPtGX6r7NZ_tW_' +admin_tenant_name = 'system' + +frontend_url = "http://10.168.222.245:8899" + +log_level = "debug" diff --git a/build/webconsole/vars b/build/webconsole/vars new file mode 100644 index 0000000000..e70015cc2c --- /dev/null +++ b/build/webconsole/vars @@ -0,0 +1 @@ +DESCRIPTION="Yunion Cloud Webconsole Service" diff --git a/pkg/webconsole/server/tty_server.go b/pkg/webconsole/server/tty_server.go index e9b8f6c9d5..717f7d1fa4 100644 --- a/pkg/webconsole/server/tty_server.go +++ b/pkg/webconsole/server/tty_server.go @@ -1,13 +1,9 @@ package server import ( - "os/exec" - "strings" - socketio "github.com/googollee/go-socket.io" "github.com/kr/pty" - "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/onecloud/pkg/webconsole/session" @@ -42,24 +38,6 @@ func NewTTYServer(s *session.SSession) (*TTYServer, error) { return server, nil } -func fetchCommand(so socketio.Socket) (*exec.Cmd, error) { - req := so.Request() - query, err := jsonutils.ParseQueryString(req.URL.RawQuery) - if err != nil { - return nil, err - } - cmd, err := query.GetString(COMMAND_QUERY) - if err != nil { - return nil, err - } - args := []string{} - argsStr, _ := query.GetString(ARGS_QUERY) - if len(argsStr) != 0 { - args = strings.Split(argsStr, ",") - } - return exec.Command(cmd, args...), nil -} - func (server *TTYServer) initEventHandler(s *session.SSession) { server.On(ON_CONNECTION, func(so socketio.Socket) error { log.Infof("[%q] On connection", so.Id())