feat: log output in ws mode
This commit is contained in:
1 parent
a2f1721ee1
commit
2c8c7688b4
3 files changed
+125
-47
No files matched your search
+69
-44
@@ -1,10 +1,12 @@
|
|||||||
package ws
|
package ws
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
uuid "github.com/satori/go.uuid"
|
"go-admin/tools"
|
||||||
|
"go-admin/tools/app"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -24,14 +26,17 @@ type Manager struct {
|
|||||||
|
|
||||||
// Client 单个 websocket 信息
|
// Client 单个 websocket 信息
|
||||||
type Client struct {
|
type Client struct {
|
||||||
Id, Group string
|
Id, Group string
|
||||||
Socket *websocket.Conn
|
Context context.Context
|
||||||
Message chan []byte
|
CancelFunc context.CancelFunc
|
||||||
|
Socket *websocket.Conn
|
||||||
|
Message chan []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
// messageData 单个发送数据信息
|
// messageData 单个发送数据信息
|
||||||
type MessageData struct {
|
type MessageData struct {
|
||||||
Id, Group string
|
Id, Group string
|
||||||
|
Context context.Context
|
||||||
Message []byte
|
Message []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,16 +52,19 @@ type BroadCastMessageData struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 读信息,从 websocket 连接直接读取数据
|
// 读信息,从 websocket 连接直接读取数据
|
||||||
func (c *Client) Read() {
|
func (c *Client) Read(cxt context.Context) {
|
||||||
defer func() {
|
defer func(cxt context.Context) {
|
||||||
WebsocketManager.UnRegister <- c
|
WebsocketManager.UnRegister <- c
|
||||||
log.Printf("client [%s] disconnect", c.Id)
|
log.Printf("client [%s] disconnect", c.Id)
|
||||||
if err := c.Socket.Close(); err != nil {
|
if err := c.Socket.Close(); err != nil {
|
||||||
log.Printf("client [%s] disconnect err: %s", c.Id, err)
|
log.Printf("client [%s] disconnect err: %s", c.Id, err)
|
||||||
}
|
}
|
||||||
}()
|
}(cxt)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
if cxt.Err() != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
messageType, message, err := c.Socket.ReadMessage()
|
messageType, message, err := c.Socket.ReadMessage()
|
||||||
if err != nil || messageType == websocket.CloseMessage {
|
if err != nil || messageType == websocket.CloseMessage {
|
||||||
break
|
break
|
||||||
@@ -67,15 +75,18 @@ func (c *Client) Read() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 写信息,从 channel 变量 Send 中读取数据写入 websocket 连接
|
// 写信息,从 channel 变量 Send 中读取数据写入 websocket 连接
|
||||||
func (c *Client) Write() {
|
func (c *Client) Write(cxt context.Context) {
|
||||||
defer func() {
|
defer func(cxt context.Context, ) {
|
||||||
log.Printf("client [%s] disconnect", c.Id)
|
log.Printf("client [%s] disconnect", c.Id)
|
||||||
if err := c.Socket.Close(); err != nil {
|
if err := c.Socket.Close(); err != nil {
|
||||||
log.Printf("client [%s] disconnect err: %s", c.Id, err)
|
log.Printf("client [%s] disconnect err: %s", c.Id, err)
|
||||||
}
|
}
|
||||||
}()
|
}(cxt)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
if cxt.Err() != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
select {
|
select {
|
||||||
case message, ok := <-c.Message:
|
case message, ok := <-c.Message:
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -87,6 +98,8 @@ func (c *Client) Write() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("client [%s] writemessage err: %s", c.Id, err)
|
log.Printf("client [%s] writemessage err: %s", c.Id, err)
|
||||||
}
|
}
|
||||||
|
case _ = <-c.Context.Done():
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -114,16 +127,17 @@ func (manager *Manager) Start() {
|
|||||||
case client := <-manager.UnRegister:
|
case client := <-manager.UnRegister:
|
||||||
log.Printf("unregister client [%s] from group [%s]", client.Id, client.Group)
|
log.Printf("unregister client [%s] from group [%s]", client.Id, client.Group)
|
||||||
manager.Lock.Lock()
|
manager.Lock.Lock()
|
||||||
if _, ok := manager.Group[client.Group]; ok {
|
if mGroup, ok := manager.Group[client.Group]; ok {
|
||||||
if _, ok := manager.Group[client.Group][client.Id]; ok {
|
if mClient, ok := mGroup[client.Id]; ok {
|
||||||
close(client.Message)
|
close(mClient.Message)
|
||||||
delete(manager.Group[client.Group], client.Id)
|
delete(mGroup, client.Id)
|
||||||
manager.clientCount -= 1
|
manager.clientCount -= 1
|
||||||
if len(manager.Group[client.Group]) == 0 {
|
if len(mGroup) == 0 {
|
||||||
//log.Printf("delete empty group [%s]", client.Group)
|
//log.Printf("delete empty group [%s]", client.Group)
|
||||||
delete(manager.Group, client.Group)
|
delete(manager.Group, client.Group)
|
||||||
manager.groupCount -= 1
|
manager.groupCount -= 1
|
||||||
}
|
}
|
||||||
|
mClient.CancelFunc()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
manager.Lock.Unlock()
|
manager.Lock.Unlock()
|
||||||
@@ -183,9 +197,10 @@ func (manager *Manager) SendAllService() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 向指定的 client 发送数据
|
// 向指定的 client 发送数据
|
||||||
func (manager *Manager) Send(id string, group string, message []byte) {
|
func (manager *Manager) Send(cxt context.Context, id string, group string, message []byte) {
|
||||||
data := &MessageData{
|
data := &MessageData{
|
||||||
Id: id,
|
Id: id,
|
||||||
|
Context: cxt,
|
||||||
Group: group,
|
Group: group,
|
||||||
Message: message,
|
Message: message,
|
||||||
}
|
}
|
||||||
@@ -255,57 +270,67 @@ var WebsocketManager = Manager{
|
|||||||
}
|
}
|
||||||
|
|
||||||
// gin 处理 websocket handler
|
// gin 处理 websocket handler
|
||||||
func (manager *Manager) WsClient(ctx *gin.Context) {
|
func (manager *Manager) WsClient(c *gin.Context) {
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
|
||||||
upGrader := websocket.Upgrader{
|
upGrader := websocket.Upgrader{
|
||||||
// cross origin domain
|
// cross origin domain
|
||||||
CheckOrigin: func(r *http.Request) bool {
|
CheckOrigin: func(r *http.Request) bool {
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
// 处理 Sec-WebSocket-Protocol Header
|
// 处理 Sec-WebSocket-Protocol Header
|
||||||
Subprotocols: []string{ctx.GetHeader("Sec-WebSocket-Protocol")},
|
Subprotocols: []string{c.GetHeader("Sec-WebSocket-Protocol")},
|
||||||
}
|
}
|
||||||
|
|
||||||
conn, err := upGrader.Upgrade(ctx.Writer, ctx.Request, nil)
|
conn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("websocket connect error: %s", ctx.Param("channel"))
|
log.Printf("websocket connect error: %s", c.Param("channel"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("token: ",ctx.Query("token"))
|
fmt.Println("token: ", c.Query("token"))
|
||||||
|
|
||||||
client := &Client{
|
client := &Client{
|
||||||
Id: uuid.NewV4().String(),
|
Id: c.Param("id"),
|
||||||
Group: ctx.Param("channel"),
|
Group: c.Param("channel"),
|
||||||
Socket: conn,
|
Context: ctx,
|
||||||
Message: make(chan []byte, 1024),
|
CancelFunc: cancel,
|
||||||
|
Socket: conn,
|
||||||
|
Message: make(chan []byte, 1024),
|
||||||
}
|
}
|
||||||
|
|
||||||
manager.RegisterClient(client)
|
manager.RegisterClient(client)
|
||||||
//go client.Read()
|
go client.Read(ctx)
|
||||||
go client.Write()
|
go client.Write(ctx)
|
||||||
time.Sleep(time.Second * 15)
|
time.Sleep(time.Second * 15)
|
||||||
// 测试单个 client 发送数据
|
|
||||||
//manager.Send(client.Id, client.Group, []byte("Send message ----"+time.Now().Format("2006-01-02 15:04:05")))
|
tools.FileMonitoringById(ctx, "temp/logs/job/db-20200820.log", c.Param("id"), c.Param("channel"), SendOne)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 测试组广播
|
func (manager *Manager) UnWsClient(c *gin.Context) {
|
||||||
func TestSendGroup() {
|
id := c.Param("id")
|
||||||
for {
|
group := c.Param("channel")
|
||||||
time.Sleep(time.Second * 20)
|
WsLogout(id, group)
|
||||||
WebsocketManager.SendGroup("leffss", []byte("SendGroup message ----"+time.Now().Format("2006-01-02 15:04:05")))
|
app.OK(c, "ws close success", "success")
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 测试广播
|
func SendGroup(msg []byte) {
|
||||||
func TestSendAll() {
|
WebsocketManager.SendGroup("leffss", []byte("{\"code\":200,\"data\":"+string(msg)+"}"))
|
||||||
for {
|
fmt.Println(WebsocketManager.Info())
|
||||||
time.Sleep(time.Second * 25)
|
|
||||||
WebsocketManager.SendAll([]byte("SendAll message ----" + time.Now().Format("2006-01-02 15:04:05")))
|
|
||||||
fmt.Println(WebsocketManager.Info())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func SendAll(msg string) {
|
func SendAll(msg []byte) {
|
||||||
WebsocketManager.SendAll([]byte("{\"code\":200,\"data\":"+msg+"}"))
|
WebsocketManager.SendAll([]byte("{\"code\":200,\"data\":" + string(msg) + "}"))
|
||||||
|
fmt.Println(WebsocketManager.Info())
|
||||||
|
}
|
||||||
|
|
||||||
|
func SendOne(ctx context.Context, id string, group string, msg []byte) {
|
||||||
|
WebsocketManager.Send(ctx, id, group, []byte("{\"code\":200,\"data\":"+string(msg)+"}"))
|
||||||
|
fmt.Println(WebsocketManager.Info())
|
||||||
|
}
|
||||||
|
|
||||||
|
func WsLogout(id string, group string) {
|
||||||
|
WebsocketManager.UnRegisterClient(&Client{Id: id, Group: group})
|
||||||
fmt.Println(WebsocketManager.Info())
|
fmt.Println(WebsocketManager.Info())
|
||||||
}
|
}
|
||||||
+6
-3
@@ -45,9 +45,6 @@ func sysBaseRouter(r *gin.RouterGroup) {
|
|||||||
|
|
||||||
r.GET("/", system.HelloWorld)
|
r.GET("/", system.HelloWorld)
|
||||||
|
|
||||||
r.GET("/ws", ws.WebsocketManager.WsClient)
|
|
||||||
|
|
||||||
|
|
||||||
r.GET("/info", handler.Ping)
|
r.GET("/info", handler.Ping)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +124,12 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
|
|||||||
// Refresh time can be longer than token timeout
|
// Refresh time can be longer than token timeout
|
||||||
r.GET("/refresh_token", authMiddleware.RefreshHandler)
|
r.GET("/refresh_token", authMiddleware.RefreshHandler)
|
||||||
|
|
||||||
|
r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
|
||||||
|
|
||||||
|
r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
v1 := r.Group("/api/v1")
|
v1 := r.Group("/api/v1")
|
||||||
|
|
||||||
registerPageRouter(v1, authMiddleware)
|
registerPageRouter(v1, authMiddleware)
|
||||||
|
|||||||
@@ -2,13 +2,16 @@ package tools
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"archive/zip"
|
"archive/zip"
|
||||||
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"context"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func PathExists(path string) (bool, error) {
|
func PathExists(path string) (bool, error) {
|
||||||
@@ -158,3 +161,50 @@ func (h ReplaceHelper) walkCallback(path string, f os.FileInfo, err error) error
|
|||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func FileMonitoring(filePth string, hookfn func([]byte)) {
|
||||||
|
f, err := os.Open(filePth)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
rd := bufio.NewReader(f)
|
||||||
|
f.Seek(0, 2)
|
||||||
|
for {
|
||||||
|
line, err := rd.ReadBytes('\n')
|
||||||
|
// 如果是文件末尾不返回
|
||||||
|
if err == io.EOF {
|
||||||
|
time.Sleep(500 * time.Millisecond)
|
||||||
|
continue
|
||||||
|
} else if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
|
go hookfn(line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func FileMonitoringById(ctx context.Context, filePth string, id string, group string, hookfn func(context.Context, string, string, []byte)) {
|
||||||
|
f, err := os.Open(filePth)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
rd := bufio.NewReader(f)
|
||||||
|
f.Seek(0, 2)
|
||||||
|
for {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
line, err := rd.ReadBytes('\n')
|
||||||
|
// 如果是文件末尾不返回
|
||||||
|
if err == io.EOF {
|
||||||
|
time.Sleep(500 * time.Millisecond)
|
||||||
|
continue
|
||||||
|
} else if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
|
go hookfn(ctx, id, group, line)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user