From 4ea600d34ec983cb9dd1e3af6f39b160144f262e Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Fri, 13 Nov 2015 09:13:53 +0100
Subject: [PATCH] lru.Cache is not concurrency safe

---
 cmd/discosrv/querysrv.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/cmd/discosrv/querysrv.go b/cmd/discosrv/querysrv.go
index 6b30d777..7a7c96fb 100644
--- a/cmd/discosrv/querysrv.go
+++ b/cmd/discosrv/querysrv.go
@@ -12,6 +12,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"sync"
 	"time"
 
 	"github.com/golang/groupcache/lru"
@@ -23,7 +24,7 @@ type querysrv struct {
 	addr     string
 	db       *sql.DB
 	prep     map[string]*sql.Stmt
-	limiter  *lru.Cache
+	limiter  *safeCache
 	cert     tls.Certificate
 	listener net.Listener
 }
@@ -38,8 +39,28 @@ type annRelay struct {
 	Latency int    `json:"latency"`
 }
 
+type safeCache struct {
+	*lru.Cache
+	mut sync.Mutex
+}
+
+func (s *safeCache) Get(key string) (val interface{}, ok bool) {
+	s.mut.Lock()
+	val, ok = s.Cache.Get(key)
+	s.mut.Unlock()
+	return
+}
+
+func (s *safeCache) Add(key string, val interface{}) {
+	s.mut.Lock()
+	s.Cache.Add(key, val)
+	s.mut.Unlock()
+}
+
 func (s *querysrv) Serve() {
-	s.limiter = lru.New(lruSize)
+	s.limiter = &safeCache{
+		Cache: lru.New(lruSize),
+	}
 
 	if useHttp {
 		listener, err := net.Listen("tcp", s.addr)