Commit 096757c8 authored by ibuler's avatar ibuler

[Update] 修改timeout

parent af8cfdaf
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"net" "net"
"net/http" "net/http"
"path/filepath" "path/filepath"
"time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/kataras/neffos" "github.com/kataras/neffos"
...@@ -17,26 +18,30 @@ var ( ...@@ -17,26 +18,30 @@ var (
httpServer *http.Server httpServer *http.Server
) )
var wsEvents = neffos.Namespaces{ var wsEvents = neffos.WithTimeout{
"ssh": neffos.Events{ ReadTimeout: 24 * time.Hour,
neffos.OnNamespaceConnected: OnNamespaceConnected, WriteTimeout: 24 * time.Hour,
neffos.OnNamespaceDisconnect: OnNamespaceDisconnect, Namespaces: neffos.Namespaces{
neffos.OnRoomJoined: func(c *neffos.NSConn, msg neffos.Message) error { "ssh": neffos.Events{
return nil neffos.OnNamespaceConnected: OnNamespaceConnected,
neffos.OnNamespaceDisconnect: OnNamespaceDisconnect,
neffos.OnRoomJoined: func(c *neffos.NSConn, msg neffos.Message) error {
return nil
},
neffos.OnRoomLeft: func(c *neffos.NSConn, msg neffos.Message) error {
return nil
},
"data": OnDataHandler,
"resize": OnResizeHandler,
"host": OnHostHandler,
"logout": OnLogoutHandler,
"token": OnTokenHandler,
}, },
neffos.OnRoomLeft: func(c *neffos.NSConn, msg neffos.Message) error { "elfinder": neffos.Events{
return nil neffos.OnNamespaceConnected: OnELFinderConnect,
neffos.OnNamespaceDisconnect: OnELFinderDisconnect,
}, },
"data": OnDataHandler,
"resize": OnResizeHandler,
"host": OnHostHandler,
"logout": OnLogoutHandler,
"token": OnTokenHandler,
},
"elfinder": neffos.Events{
neffos.OnNamespaceConnected: OnELFinderConnect,
neffos.OnNamespaceDisconnect: OnELFinderDisconnect,
}, },
} }
...@@ -48,6 +53,17 @@ func StartHTTPServer() { ...@@ -48,6 +53,17 @@ func StartHTTPServer() {
} }
sshWs.OnUpgradeError = func(err error) { sshWs.OnUpgradeError = func(err error) {
} }
sshWs.OnConnect = func(c *neffos.Conn) error {
if c.WasReconnected() {
logger.Debugf("Connection reconnected, with tries: %d", c.ID(), c.ReconnectTries)
} else {
logger.Debug("A new ws connection arrive")
}
return nil
}
sshWs.OnDisconnect = func(c *neffos.Conn) {
logger.Debug("Ws connection disconnect")
}
router := mux.NewRouter() router := mux.NewRouter()
fs := http.FileServer(http.Dir(filepath.Join(conf.RootPath, "static"))) fs := http.FileServer(http.Dir(filepath.Join(conf.RootPath, "static")))
......
...@@ -24,10 +24,9 @@ import ( ...@@ -24,10 +24,9 @@ import (
func OnNamespaceConnected(c *neffos.NSConn, msg neffos.Message) error { func OnNamespaceConnected(c *neffos.NSConn, msg neffos.Message) error {
// 首次连接 1.获取当前用户的信息 // 首次连接 1.获取当前用户的信息
cc := c.Conn cc := c.Conn
logger.Debug("Web terminal on connect event trigger")
if cc.WasReconnected() { if cc.WasReconnected() {
logger.Debugf("Web terminal reconnected, with tries: %d", cc.ID(), cc.ReconnectTries)
} else { } else {
logger.Debug("Web terminal on connect event trigger")
} }
request := cc.Socket().Request() request := cc.Socket().Request()
header := request.Header header := request.Header
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment