Refactor code: clear old OIDs in the Session before updating them
This commit is contained in:
@@ -5,6 +5,7 @@ package ifmib
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"reflect"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -161,14 +162,32 @@ func (m *InterfaceMIB) UpdateInterfaceDetails(details []vpp.InterfaceDetails) {
|
|||||||
logger.Debugf("Interface details updated for %d interfaces", len(details))
|
logger.Debugf("Interface details updated for %d interfaces", len(details))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *InterfaceMIB) clearHandler() {
|
||||||
|
// Use reflection to access and clear the private fields of ListHandler
|
||||||
|
// since it doesn't have a Clear() method
|
||||||
|
handlerValue := reflect.ValueOf(m.handler).Elem()
|
||||||
|
|
||||||
|
oidsField := handlerValue.FieldByName("oids")
|
||||||
|
itemsField := handlerValue.FieldByName("items")
|
||||||
|
|
||||||
|
if oidsField.IsValid() && oidsField.CanSet() {
|
||||||
|
oidsField.Set(reflect.Zero(oidsField.Type()))
|
||||||
|
}
|
||||||
|
|
||||||
|
if itemsField.IsValid() && itemsField.CanSet() {
|
||||||
|
itemsField.Set(reflect.Zero(itemsField.Type()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (m *InterfaceMIB) UpdateStats(interfaceStats *api.InterfaceStats) {
|
func (m *InterfaceMIB) UpdateStats(interfaceStats *api.InterfaceStats) {
|
||||||
m.mutex.Lock()
|
m.mutex.Lock()
|
||||||
defer m.mutex.Unlock()
|
defer m.mutex.Unlock()
|
||||||
|
|
||||||
logger.Debugf("Updating IF-MIB with %d interfaces", len(interfaceStats.Interfaces))
|
logger.Debugf("Updating IF-MIB with %d interfaces", len(interfaceStats.Interfaces))
|
||||||
|
|
||||||
// Clear existing entries
|
// Clear existing entries while preserving the handler reference
|
||||||
m.handler = &agentx.ListHandler{}
|
// Since go-agentx 0.3.0 binds handlers to sessions at creation time
|
||||||
|
m.clearHandler()
|
||||||
m.stats = make(map[uint32]*api.InterfaceCounters)
|
m.stats = make(map[uint32]*api.InterfaceCounters)
|
||||||
|
|
||||||
// Add new entries
|
// Add new entries
|
||||||
@@ -178,11 +197,7 @@ func (m *InterfaceMIB) UpdateStats(interfaceStats *api.InterfaceStats) {
|
|||||||
m.addInterfaceToMIB(&iface)
|
m.addInterfaceToMIB(&iface)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: With go-agentx 0.3.0, handlers are set during session creation and cannot be changed
|
logger.Printf("Updated IF-MIB data for %d interfaces", len(m.stats))
|
||||||
if m.ifXTableSession != nil {
|
|
||||||
logger.Printf("Updated IF-MIB data for %d interfaces", len(m.stats))
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.Debugf("IF-MIB now contains %d interfaces", len(m.stats))
|
logger.Debugf("IF-MIB now contains %d interfaces", len(m.stats))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user