merge

pkg/cache/memcache.go

@@ -4,7 +4,6 @@ import (
 	"container/list"
 	"sync"
 	"sync/atomic"
-	//"fmt"
 )
 
 // An AtomicInt is an int64 to be accessed atomically.
@@ -12,11 +11,11 @@ type AtomicInt int64
 
 // MemCache is an LRU cache. It is safe for concurrent access.
 type MemCache struct {
+	hits, gets  AtomicInt
 	mutex       sync.RWMutex
 	maxItemSize int
 	cacheList   *list.List
 	cache       map[interface{}]*list.Element
-	hits, gets  AtomicInt
 }
 
 type entry struct {

services/registry/registry.go

@@ -177,7 +177,7 @@ func (r *Registry) ValidateApplication(key string, reply *models.Application) er
 		app := cacheValue.(*models.Application)
 		setApplication(reply, app)
 	} else {
-		err = db.First(reply, id).Error
+		err = db.First(reply, "record_id = ?", id).Error
 		if err != nil {
 			return err
 		}
@@ -489,4 +489,4 @@ func (r *Registry) CreateEvent(args *models.Event, reply *rpcs.ReplyEmptyResult)
 		return err
 	}
 	return db.Save(args).Error
-}
+}