修复运维中心中开启历史日志后再开启实时日志连接失败

pull/1682/head
648540858 2024-11-04 10:15:45 +08:00
parent 2161cf6866
commit 2c4311b58c
3 changed files with 8 additions and 5 deletions

View File

@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j;
import javax.websocket.*; import javax.websocket.*;
import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpoint;
import java.io.IOException; import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@ -31,7 +30,6 @@ public class LogChannel {
public void onOpen(Session session, EndpointConfig endpointConfig) { public void onOpen(Session session, EndpointConfig endpointConfig) {
this.session = session; this.session = session;
this.session.setMaxIdleTimeout(0); this.session.setMaxIdleTimeout(0);
System.out.println();
CHANNELS.put(this.session.getId(), this); CHANNELS.put(this.session.getId(), this);
log.info("[Web-Log] 连接已建立: id={}", this.session.getId()); log.info("[Web-Log] 连接已建立: id={}", this.session.getId());
@ -41,7 +39,6 @@ public class LogChannel {
public void onClose(CloseReason closeReason) { public void onClose(CloseReason closeReason) {
log.info("[Web-Log] 连接已断开: id={}, err={}", this.session.getId(), closeReason); log.info("[Web-Log] 连接已断开: id={}, err={}", this.session.getId(), closeReason);
CHANNELS.remove(this.session.getId()); CHANNELS.remove(this.session.getId());
} }

View File

@ -32,6 +32,7 @@ export default {
filter: "", filter: "",
logData: "", logData: "",
websocket: null, websocket: null,
destroyedCallback: null
}; };
}, },
watch: { watch: {
@ -61,7 +62,9 @@ export default {
}, },
destroyed() { destroyed() {
console.log('destroyed'); console.log('destroyed');
window.websocket.close(); if (this.destroyedCallback) {
this.destroyedCallback()
}
}, },
methods: { methods: {
initData: function () { initData: function () {
@ -101,6 +104,9 @@ export default {
} }
window.websocket.onopen = e => { window.websocket.onopen = e => {
console.log(`conn open: ${e}`); console.log(`conn open: ${e}`);
this.destroyedCallback = ()=>{
window.websocket.close()
}
} }
} }
}, },

View File

@ -18,8 +18,8 @@ export default {
winHeight: window.innerHeight - 220, winHeight: window.innerHeight - 220,
}; };
}, },
created() { created() {
console.log("removeUrl11 == " + this.removeUrl)
}, },
methods: { methods: {
getURl: function () { getURl: function () {