Fix startup/teardown order, add documentation

This commit is contained in:
Fabian Reinartz 2016-01-18 16:47:31 +01:00
parent 4a829e63a2
commit 7e1b39c682
2 changed files with 10 additions and 4 deletions

View file

@ -132,7 +132,8 @@ func Main() int {
} }
}() }()
// Start all components. // Start all components. The order is NOT arbitrary.
if err := memStorage.Start(); err != nil { if err := memStorage.Start(); err != nil {
log.Errorln("Error opening memory series storage:", err) log.Errorln("Error opening memory series storage:", err)
return 1 return 1
@ -155,15 +156,19 @@ func Main() int {
prometheus.MustRegister(configSuccess) prometheus.MustRegister(configSuccess)
prometheus.MustRegister(configSuccessTime) prometheus.MustRegister(configSuccessTime)
go ruleManager.Run() // The notification is a dependency of the rule manager. It has to be
defer ruleManager.Stop() // started before and torn down afterwards.
go notificationHandler.Run() go notificationHandler.Run()
defer notificationHandler.Stop() defer notificationHandler.Stop()
go ruleManager.Run()
defer ruleManager.Stop()
go targetManager.Run() go targetManager.Run()
defer targetManager.Stop() defer targetManager.Stop()
// Shutting down the query engine before the rule manager will cause pending queries
// to be canceled and ensures a quick shutdown of the rule manager.
defer queryEngine.Stop() defer queryEngine.Stop()
go webHandler.Run() go webHandler.Run()

View file

@ -200,6 +200,7 @@ func (n *Handler) Run() {
} }
// SubmitReqs queues the given notification requests for processing. // SubmitReqs queues the given notification requests for processing.
// Panics if called on a handler that is not running.
func (n *Handler) Send(alerts ...*model.Alert) { func (n *Handler) Send(alerts ...*model.Alert) {
n.mtx.Lock() n.mtx.Lock()
defer n.mtx.Unlock() defer n.mtx.Unlock()