Merge pull request #593 from akutz/bugfix/endpoint-service-init-order

Endpoint/Service Init Order Fix
thecodeteam · Jul 22, 2017 · 6835fcb · 6835fcb
2 parents 670ae33 + cb162ff
commit 6835fcb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/api/server/server.go b/api/server/server.go
@@ -164,15 +164,15 @@ func newServer(goCtx gocontext.Context, config gofig.Config) (*server, error) {
 
 	s.ctx.Info("initializing server")
 
-	if err := s.initEndpoints(s.ctx); err != nil {
+	if err := services.Init(s.ctx, s.config); err != nil {
 		return nil, err
 	}
-	s.ctx.Info("initialized endpoints")
+	s.ctx.Info("initialized services")
 
-	if err := services.Init(s.ctx, s.config); err != nil {
+	if err := s.initEndpoints(s.ctx); err != nil {
 		return nil, err
 	}
-	s.ctx.Info("initialized services")
+	s.ctx.Info("initialized endpoints")
 
 	if logConfig.HTTPRequests || logConfig.HTTPResponses {
 		s.logHTTPEnabled = true