1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-22 01:06:30 -05:00

Merge pull request #172 from Vigilans/vigilans/stats-unregister

Add UnregisterChannel & Modify unregistering logic
This commit is contained in:
Loyalsoldier 2020-09-09 13:09:20 +08:00 committed by GitHub
commit 0a793e28fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions

View File

@ -130,11 +130,11 @@ func (m *Manager) RegisterCounter(name string) (stats.Counter, error) {
func (m *Manager) UnregisterCounter(name string) error { func (m *Manager) UnregisterCounter(name string) error {
m.access.Lock() m.access.Lock()
defer m.access.Unlock() defer m.access.Unlock()
if _, found := m.counters[name]; !found {
return newError("Counter ", name, " was not found.") if _, found := m.counters[name]; found {
}
newError("remove counter ", name).AtDebug().WriteToLog() newError("remove counter ", name).AtDebug().WriteToLog()
delete(m.counters, name) delete(m.counters, name)
}
return nil return nil
} }
@ -176,6 +176,18 @@ func (m *Manager) RegisterChannel(name string) (stats.Channel, error) {
return c, nil return c, nil
} }
// UnregisterChannel implements stats.Manager.
func (m *Manager) UnregisterChannel(name string) error {
m.access.Lock()
defer m.access.Unlock()
if _, found := m.channels[name]; found {
newError("remove channel ", name).AtDebug().WriteToLog()
delete(m.channels, name)
}
return nil
}
// GetChannel implements stats.Manager. // GetChannel implements stats.Manager.
func (m *Manager) GetChannel(name string) stats.Channel { func (m *Manager) GetChannel(name string) stats.Channel {
m.access.RLock() m.access.RLock()

View File

@ -38,12 +38,15 @@ type Manager interface {
// RegisterCounter registers a new counter to the manager. The identifier string must not be empty, and unique among other counters. // RegisterCounter registers a new counter to the manager. The identifier string must not be empty, and unique among other counters.
RegisterCounter(string) (Counter, error) RegisterCounter(string) (Counter, error)
// UnregisterCounter unregisters a counter from the manager by its identifier.
UnregisterCounter(string) error UnregisterCounter(string) error
// GetCounter returns a counter by its identifier. // GetCounter returns a counter by its identifier.
GetCounter(string) Counter GetCounter(string) Counter
// RegisterChannel registers a new channel to the manager. The identifier string must not be empty, and unique among other channels. // RegisterChannel registers a new channel to the manager. The identifier string must not be empty, and unique among other channels.
RegisterChannel(string) (Channel, error) RegisterChannel(string) (Channel, error)
// UnregisterCounter unregisters a channel from the manager by its identifier.
UnregisterChannel(string) error
// GetChannel returns a channel by its identifier. // GetChannel returns a channel by its identifier.
GetChannel(string) Channel GetChannel(string) Channel
} }
@ -90,7 +93,7 @@ func (NoopManager) RegisterCounter(string) (Counter, error) {
// UnregisterCounter implements Manager. // UnregisterCounter implements Manager.
func (NoopManager) UnregisterCounter(string) error { func (NoopManager) UnregisterCounter(string) error {
return newError("not implemented") return nil
} }
// GetCounter implements Manager. // GetCounter implements Manager.
@ -103,6 +106,11 @@ func (NoopManager) RegisterChannel(string) (Channel, error) {
return nil, newError("not implemented") return nil, newError("not implemented")
} }
// UnregisterChannel implements Manager.
func (NoopManager) UnregisterChannel(string) error {
return nil
}
// GetChannel implements Manager. // GetChannel implements Manager.
func (NoopManager) GetChannel(string) Channel { func (NoopManager) GetChannel(string) Channel {
return nil return nil