Merge pull request #10 from mozilla-services/exceptpanic

dont start serving requests until exceptions have been populated

Author: Aaron Meihm

exception.go

@@ -16,6 +16,7 @@ import (
 
 var activeTree *iptree.IPTree
 var treeLock sync.Mutex
+var isExceptionUpdate bool = false
 
 type awsIPRanges struct {
 	Prefixes []struct {
@@ -28,6 +29,14 @@ const awsIPRangeURL = "https://ip-ranges.amazonaws.com/ip-ranges.json"
 func startExceptions() {
 	for {
 		loadExceptions()
+
+		// If this was the first exception load, send a note to the main thread
+		// to indicate the API can begin processing requests
+		if !isExceptionUpdate {
+			sruntime.exceptionsLoaded <- true
+			isExceptionUpdate = true
+		}
+
 		time.Sleep(time.Hour)
 	}
 }
@@ -83,6 +92,7 @@ func loadExceptions() {
 	treeLock.Lock()
 	activeTree = t
 	treeLock.Unlock()
+
 	log.Info("completed exception refresh")
 }
 

iprepd.go

@@ -11,9 +11,10 @@ import (
 )
 
 type serverRuntime struct {
-	cfg             serverCfg
-	redis           redisLink
-	versionResponse []byte
+	cfg              serverCfg
+	redis            redisLink
+	versionResponse  []byte
+	exceptionsLoaded chan bool
 }
 
 type serverCfg struct {
@@ -91,6 +92,7 @@ func StartDaemon(confpath string) {
 	log.Infof("starting daemon")
 
 	var err error
+	sruntime.exceptionsLoaded = make(chan bool, 1)
 	sruntime.cfg, err = loadCfg(confpath)
 	if err != nil {
 		log.Fatalf(err.Error())
@@ -104,6 +106,12 @@ func StartDaemon(confpath string) {
 		log.Warnf(err.Error())
 	}
 	go startExceptions()
+	select {
+	case <-sruntime.exceptionsLoaded:
+		log.Infof("initial exception load completed, starting API")
+	case <-time.After(5 * time.Second):
+		log.Fatalf("initial exception load timed out")
+	}
 	err = startAPI()
 	if err != nil {
 		log.Fatalf(err.Error())