pangolin_mirror/olm
1
0
Fork 0
mirror of https://github.com/fosrl/olm.git synced 2026-02-07 21:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle and test config version bugs

Browse Source 
Former-commit-id: 285f8ce530
This commit is contained in:
Owen
2026-01-15 16:36:11 -08:00
parent 9dcc0796a6
commit e047330ffd
3 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
websocket/client.go
View File

@@ -665,6 +665,8 @@ func (c *Client) pingMonitor() {
ConfigVersion: configVersion,
}
logger.Debug("++++++++++++++++++++++++++++websocket: Sending ping: %+v", pingMsg)
c.writeMux.Lock()
err := c.conn.WriteJSON(pingMsg)
c.writeMux.Unlock()
@@ -695,9 +697,8 @@ func (c *Client) GetConfigVersion() int {
func (c *Client) setConfigVersion(version int) {
c.configVersionMux.Lock()
defer c.configVersionMux.Unlock()
if version > c.configVersion {
c.configVersion = version
}
logger.Debug("++++++++++++++++++++++++++++websocket: setting config version to %d", version)
c.configVersion = version
}
// readPumpWithDisconnectDetection reads messages and triggers reconnect on error
@@ -748,9 +749,7 @@ func (c *Client) readPumpWithDisconnectDetection() {
}
// Update config version from incoming message
if msg.ConfigVersion > 0 {
c.setConfigVersion(msg.ConfigVersion)
}
c.setConfigVersion(msg.ConfigVersion)
c.handlersMux.RLock()
if handler, ok := c.handlers[msg.Type]; ok {