Chore: merge branch 'ong-dev' into with-tun

This commit is contained in:
yaling888
2022-04-27 05:33:49 +08:00
2 changed files with 23 additions and 12 deletions

View File

@ -209,16 +209,26 @@ func getLogs(w http.ResponseWriter, r *http.Request) {
render.Status(r, http.StatusOK)
}
ch := make(chan log.Event, 1024)
sub := log.Subscribe()
defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error
for elm := range sub {
buf.Reset()
logM := elm
go func() {
for elm := range sub {
select {
case ch <- elm:
default:
}
}
close(ch)
}()
for logM := range ch {
if logM.LogLevel < level {
continue
}
buf.Reset()
if err := json.NewEncoder(buf).Encode(Log{
Type: logM.Type(),
@ -227,6 +237,7 @@ func getLogs(w http.ResponseWriter, r *http.Request) {
break
}
var err error
if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()