forked from Plemya-x/ALR
		
	chore: replace old logger with new
This commit is contained in:
		| @@ -21,11 +21,12 @@ package db | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"log/slog" | ||||
|  | ||||
| 	"github.com/jmoiron/sqlx" | ||||
| 	"github.com/leonelquinteros/gotext" | ||||
|  | ||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" | ||||
| ) | ||||
|  | ||||
| // CurrentVersion is the current version of the database. | ||||
| @@ -94,7 +95,6 @@ func (d *Database) GetConn() *sqlx.DB { | ||||
| } | ||||
|  | ||||
| func (d *Database) initDB(ctx context.Context) error { | ||||
| 	log := loggerctx.From(ctx) | ||||
| 	d.conn = d.conn.Unsafe() | ||||
| 	conn := d.conn | ||||
| 	_, err := conn.ExecContext(ctx, ` | ||||
| @@ -128,11 +128,11 @@ func (d *Database) initDB(ctx context.Context) error { | ||||
|  | ||||
| 	ver, ok := d.GetVersion(ctx) | ||||
| 	if ok && ver != CurrentVersion { | ||||
| 		log.Warn("Database version mismatch; resetting").Int("version", ver).Int("expected", CurrentVersion).Send() | ||||
| 		slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion) | ||||
| 		d.reset(ctx) | ||||
| 		return d.initDB(ctx) | ||||
| 	} else if !ok { | ||||
| 		log.Warn("Database version does not exist. Run alr fix if something isn't working.").Send() | ||||
| 		slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion) | ||||
| 		return d.addVersion(ctx, CurrentVersion) | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -18,12 +18,14 @@ package db | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"log/slog" | ||||
| 	"os" | ||||
| 	"sync" | ||||
|  | ||||
| 	"github.com/jmoiron/sqlx" | ||||
| 	"github.com/leonelquinteros/gotext" | ||||
|  | ||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" | ||||
| ) | ||||
|  | ||||
| // DB returns the ALR database. | ||||
| @@ -92,12 +94,12 @@ var ( | ||||
| // Deprecated: For legacy only | ||||
| func GetInstance(ctx context.Context) *Database { | ||||
| 	dbOnce.Do(func() { | ||||
| 		log := loggerctx.From(ctx) | ||||
| 		cfg := config.GetInstance(ctx) | ||||
| 		database = New(cfg) | ||||
| 		err := database.Init(ctx) | ||||
| 		if err != nil { | ||||
| 			log.Fatal("Error opening database").Err(err).Send() | ||||
| 			slog.Error(gotext.Get("Error opening database"), "err", err) | ||||
| 			os.Exit(1) | ||||
| 		} | ||||
| 	}) | ||||
| 	return database | ||||
|   | ||||
		Reference in New Issue
	
	Block a user