Skip to content

Commit 608a290

Browse files
committed
若干修改,方便其他程序调用
#84 要提交的变更: 修改: cmd/cmd.go 修改: go.mod 修改: go.sum 修改: wshandle/client.go
1 parent 62ab23b commit 608a290

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

cmd/cmd.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,9 @@ func Excute() {
226226
}
227227
}
228228
if err != nil {
229-
fmt.Println(err)
230-
os.Exit(1)
229+
//fmt.Println(err)
230+
//os.Exit(1)
231+
panic(err)
231232
}
232233
//}()
233234
//

wshandle/client.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,17 @@ func (c *WsConn) messageSendHandler() {
104104
err := c.Conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
105105
if err != nil {
106106
// log.Println("write close:", err)
107-
os.Exit(1)
107+
//os.Exit(1)
108+
panic(err)
108109
}
109110
select {
110111
// 等到了结果,直接退出
111112
case <-c.Done:
112113
// 如果等待 1s 还是拿不到结果,不再等待,超时退出
113114
case <-time.After(time.Second):
114115
}
115-
os.Exit(1)
116+
//os.Exit(1)
117+
panic("请求超时退出")
116118
// return
117119
}
118120
}
@@ -134,8 +136,9 @@ func (c *WsConn) recreateWsConn() {
134136
jwtToken, err = pow.GetToken(util.GetPowProvider(), util.GetPowProvider(), port)
135137
}
136138
if err != nil {
137-
log.Println(err)
138-
os.Exit(1)
139+
//log.Println(err)
140+
//os.Exit(1)
141+
panic(err)
139142
}
140143
} else {
141144
// 使用 cacheToken
@@ -206,8 +209,9 @@ func createWsConn() *WsConn {
206209
jwtToken, err = pow.GetToken(util.GetPowProvider(), util.GetPowProvider(), port)
207210
}
208211
if err != nil {
209-
log.Println(err)
210-
os.Exit(1)
212+
//log.Println(err)
213+
//os.Exit(1)
214+
panic(err)
211215
}
212216
ua = []string{util.UserAgent}
213217
}

0 commit comments

Comments
 (0)