remove crit and trace (#40320)

pkg/services/sqlstore/migrations/ualert/securejsondata.go

@@ -1,6 +1,8 @@
 package ualert
 
 import (
+	"os"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
@@ -16,7 +18,8 @@ func (s SecureJsonData) DecryptedValue(key string) (string, bool) {
 	if value, ok := s[key]; ok {
 		decryptedData, err := util.Decrypt(value, setting.SecretKey)
 		if err != nil {
-			log.Fatalf(4, err.Error())
+			log.Error(err.Error())
+			os.Exit(1)
 		}
 		return string(decryptedData), true
 	}
@@ -30,7 +33,8 @@ func (s SecureJsonData) Decrypt() map[string]string {
 	for key, data := range s {
 		decryptedData, err := util.Decrypt(data, setting.SecretKey)
 		if err != nil {
-			log.Fatalf(4, err.Error())
+			log.Error(err.Error())
+			os.Exit(1)
 		}
 
 		decrypted[key] = string(decryptedData)
@@ -44,7 +48,8 @@ func GetEncryptedJsonData(sjd map[string]string) SecureJsonData {
 	for key, data := range sjd {
 		encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey)
 		if err != nil {
-			log.Fatalf(4, err.Error())
+			log.Error(err.Error())
+			os.Exit(1)
 		}
 
 		encrypted[key] = encryptedData

pkg/services/sqlstore/migrations/ualert/ualert.go

@@ -48,7 +48,7 @@ func (e *MigrationError) Unwrap() error { return e.Err }
 func AddDashAlertMigration(mg *migrator.Migrator) {
 	logs, err := mg.GetMigrationLog()
 	if err != nil {
-		mg.Logger.Crit("alert migration failure: could not get migration log", "error", err)
+		mg.Logger.Error("alert migration failure: could not get migration log", "error", err)
 		os.Exit(1)
 	}
 
@@ -88,7 +88,7 @@ func AddDashAlertMigration(mg *migrator.Migrator) {
 func RerunDashAlertMigration(mg *migrator.Migrator) {
 	logs, err := mg.GetMigrationLog()
 	if err != nil {
-		mg.Logger.Crit("alert migration failure: could not get migration log", "error", err)
+		mg.Logger.Error("alert migration failure: could not get migration log", "error", err)
 		os.Exit(1)
 	}
 
@@ -109,7 +109,7 @@ func RerunDashAlertMigration(mg *migrator.Migrator) {
 func AddDashboardUIDPanelIDMigration(mg *migrator.Migrator) {
 	logs, err := mg.GetMigrationLog()
 	if err != nil {
-		mg.Logger.Crit("alert migration failure: could not get migration log", "error", err)
+		mg.Logger.Error("alert migration failure: could not get migration log", "error", err)
 		os.Exit(1)
 	}
 

pkg/services/sqlstore/transactions.go

@@ -67,7 +67,7 @@ func inTransactionWithRetryCtx(ctx context.Context, engine *xorm.Engine, callbac
 	if len(sess.events) > 0 {
 		for _, e := range sess.events {
 			if err = bus.Publish(e); err != nil {
-				log.Errorf(3, "Failed to publish event after commit. error: %v", err)
+				log.Error("Failed to publish event after commit.", "error", err)
 			}
 		}
 	}