mirror of
				https://github.com/grafana/grafana.git
				synced 2025-02-25 18:55:37 -06:00 
			
		
		
		
	feat(instrumentation): work on settings model for internal metrics publishing, #4696
This commit is contained in:
		@@ -64,15 +64,12 @@ func main() {
 | 
			
		||||
	social.NewOAuthService()
 | 
			
		||||
	eventpublisher.Init()
 | 
			
		||||
	plugins.Init()
 | 
			
		||||
	metrics.Init()
 | 
			
		||||
 | 
			
		||||
	if err := notifications.Init(); err != nil {
 | 
			
		||||
		log.Fatal(3, "Notification service failed to initialize", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if setting.ReportingEnabled {
 | 
			
		||||
		go metrics.StartUsageReportLoop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	StartServer()
 | 
			
		||||
	exitChan <- 0
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,7 @@ func newMacaron() *macaron.Macaron {
 | 
			
		||||
 | 
			
		||||
	for _, route := range plugins.StaticRoutes {
 | 
			
		||||
		pluginRoute := path.Join("/public/plugins/", route.PluginId)
 | 
			
		||||
		log.Info("Plugins: Adding route %s -> %s", pluginRoute, route.Directory)
 | 
			
		||||
		log.Debug("Plugins: Adding route %s -> %s", pluginRoute, route.Directory)
 | 
			
		||||
		mapStatic(m, route.Directory, "", pluginRoute)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user