VOL-1687 : Fix wrong in-memory node assignments
- Fixed nil pointer with createProxy
- Changed watch loop to avoid re-starting when rev changes
Change-Id: Ie821788f2422d7a2083398c65b9632c65fae001d
diff --git a/db/model/proxy.go b/db/model/proxy.go
index d4a86f4..182dcdd 100644
--- a/db/model/proxy.go
+++ b/db/model/proxy.go
@@ -100,8 +100,12 @@
// getCallbacks returns the full list of callbacks associated to the proxy
func (p *Proxy) getCallbacks(callbackType CallbackType) map[string]*CallbackTuple {
- if cb, exists := p.Callbacks[callbackType]; exists {
- return cb
+ if p != nil {
+ if cb, exists := p.Callbacks[callbackType]; exists {
+ return cb
+ }
+ } else {
+ log.Debugw("proxy-is-nil", log.Fields{"callback-type": callbackType.String()})
}
return nil
}
@@ -148,6 +152,7 @@
PROXY_UPDATE
PROXY_REMOVE
PROXY_CREATE
+ PROXY_WATCH
)
var proxyOperationTypes = []string{
@@ -157,6 +162,7 @@
"PROXY_UPDATE",
"PROXY_REMOVE",
"PROXY_CREATE",
+ "PROXY_WATCH",
}
func (t ProxyOperation) String() string {