fixing build after merging in master

api_loader.go

@@ -6,14 +6,13 @@ import (
 	"net/url"
 	"sort"
 	"strings"
+	"sync"
+	"sync/atomic"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
 	"github.com/justinas/alice"
 
-	"sync"
-	"sync/atomic"
-
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/coprocess"
@@ -524,11 +523,8 @@ func (d *DummyProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func loadGlobalApps() {
 	// we need to make a full copy of the slice, as loadApps will
 	// use in-place to sort the apis.
-	apisMu.RLock()
-	specs := make([]*APISpec, len(apiSpecs))
-	copy(specs, apiSpecs)
-	apisMu.RUnlock()
-	loadApps(specs, mainRouter)
+	specs := getApiSpecs()
+	loadApps(specs, mainRouter, &mainRouterMu)
 }
 
 // Create the individual API (app) specs based on live configurations and assign middleware

main.go

@@ -648,7 +648,7 @@ func doReload() {
 	syncPolicies()
 	// load the specs
 	count := syncAPISpecs()
-  // skip re-loading only if dashboard service reported 0 APIs
+	// skip re-loading only if dashboard service reported 0 APIs
 	// and current registry had 0 APIs
 	if count == 0 && apisByIDLen() == 0 {
 		log.WithFields(logrus.Fields{

rpc_backup_handlers.go

@@ -103,7 +103,8 @@ func doLoadWithBackup(specs []*APISpec) {
 	loadAPIEndpoints(mainRouter, &mainRouterMu)
 
 	log.Warning("[RPC Backup] --> Loading APIs")
-	loadApps(specs, mainRouter, &mainRouterMu)
+	currSpecs := getApiSpecs()
+	loadApps(currSpecs, mainRouter, &mainRouterMu)
 	log.Warning("[RPC Backup] --> API Load Done")
 
 	newServeMux := http.NewServeMux()