From 5d4dc18bbc7586de466feb0a935a12f575907e73 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 30 Oct 2018 12:31:28 +0100
Subject: [PATCH] revert application lifecycle event support

---
 pkg/cmd/grafana-server/server.go |  7 ++++---
 pkg/lifecycle/lifecycle.go       | 22 --------------------
 pkg/lifecycle/lifecycle_test.go  | 35 --------------------------------
 pkg/login/auth.go                |  9 +++-----
 pkg/social/social.go             |  9 +-------
 5 files changed, 8 insertions(+), 74 deletions(-)
 delete mode 100644 pkg/lifecycle/lifecycle.go
 delete mode 100644 pkg/lifecycle/lifecycle_test.go

diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index d4223df19ed..2c67a06a843 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -15,9 +15,10 @@ import (
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/lifecycle"
+	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/registry"
+	"github.com/grafana/grafana/pkg/social"
 
 	"golang.org/x/sync/errgroup"
 
@@ -69,7 +70,8 @@ func (g *GrafanaServerImpl) Run() error {
 	g.loadConfiguration()
 	g.writePIDFile()
 
-	lifecycle.Notify(lifecycle.ApplicationStarting)
+	login.Init()
+	social.NewOAuthService()
 
 	serviceGraph := inject.Graph{}
 	serviceGraph.Provide(&inject.Object{Value: bus.GetBus()})
@@ -142,7 +144,6 @@ func (g *GrafanaServerImpl) Run() error {
 	}
 
 	sendSystemdNotification("READY=1")
-	lifecycle.Notify(lifecycle.ApplicationStarted)
 	return g.childRoutines.Wait()
 }
 
diff --git a/pkg/lifecycle/lifecycle.go b/pkg/lifecycle/lifecycle.go
deleted file mode 100644
index eea733a7da8..00000000000
--- a/pkg/lifecycle/lifecycle.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package lifecycle
-
-type Event int
-
-const (
-	ApplicationStarting Event = iota
-	ApplicationStarted
-)
-
-type EventHandlerFunc func()
-
-var listeners = map[int][]EventHandlerFunc{}
-
-func AddListener(evt Event, fn EventHandlerFunc) {
-	listeners[int(evt)] = append(listeners[int(evt)], fn)
-}
-
-func Notify(evt Event) {
-	for _, handler := range listeners[int(evt)] {
-		handler()
-	}
-}
diff --git a/pkg/lifecycle/lifecycle_test.go b/pkg/lifecycle/lifecycle_test.go
deleted file mode 100644
index e946cc2f4a8..00000000000
--- a/pkg/lifecycle/lifecycle_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package lifecycle
-
-import (
-	"testing"
-
-	. "github.com/smartystreets/goconvey/convey"
-)
-
-func TestLifecycle(t *testing.T) {
-	Convey("TestLifecycle", t, func() {
-		Convey("Given listeners", func() {
-			applicationStartingCounter := 0
-			AddListener(ApplicationStarting, func() {
-				applicationStartingCounter++
-			})
-
-			applicationStartedCounter := 0
-			AddListener(ApplicationStarted, func() {
-				applicationStartedCounter++
-			})
-
-			Convey("When notify application starting should call listener", func() {
-				Notify(ApplicationStarting)
-				So(applicationStartingCounter, ShouldEqual, 1)
-				So(applicationStartedCounter, ShouldEqual, 0)
-			})
-
-			Convey("When notify application started should call listener", func() {
-				Notify(ApplicationStarted)
-				So(applicationStartingCounter, ShouldEqual, 0)
-				So(applicationStartedCounter, ShouldEqual, 1)
-			})
-		})
-	})
-}
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index b195b8dd2e4..b766d963328 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/lifecycle"
 	m "github.com/grafana/grafana/pkg/models"
 )
 
@@ -20,11 +19,9 @@ var (
 	ErrGettingUserQuota      = errors.New("Error getting user quota")
 )
 
-func init() {
-	lifecycle.AddListener(lifecycle.ApplicationStarting, func() {
-		bus.AddHandler("auth", AuthenticateUser)
-		loadLdapConfig()
-	})
+func Init() {
+	bus.AddHandler("auth", AuthenticateUser)
+	loadLdapConfig()
 }
 
 func AuthenticateUser(query *m.LoginUserQuery) error {
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 054420fd994..8918507f3b9 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -8,18 +8,11 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/grafana/grafana/pkg/lifecycle"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
-func init() {
-	lifecycle.AddListener(lifecycle.ApplicationStarting, func() {
-		initOAuthService()
-	})
-}
-
 type BasicUserInfo struct {
 	Id      string
 	Name    string
@@ -63,7 +56,7 @@ var (
 	allOauthes    = []string{"github", "gitlab", "google", "generic_oauth", "grafananet", grafanaCom}
 )
 
-func initOAuthService() {
+func NewOAuthService() {
 	setting.OAuthService = &setting.OAuther{}
 	setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo)