h/projectreshoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated all code to use SafeConn and SafeTX

Browse Source
This commit is contained in:
Haelnorr
2025-02-17 21:39:12 +11:00
parent 6faf168a6d
commit a8d112fdd5
17 changed files with 265 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main.go
View File

@@ -77,11 +77,6 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
return errors.Wrap(err, "logging.GetLogger")
}
oldconn, err := db.OldConnectToDatabase(config.DBName)
if err != nil {
return errors.Wrap(err, "db.ConnectToDatabase")
}
defer oldconn.Close()
conn, err := db.ConnectToDatabase(config.DBName)
if err != nil {
return errors.Wrap(err, "db.ConnectToDatabase")
@@ -93,7 +88,7 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
return errors.Wrap(err, "getStaticFiles")
}
srv := server.NewServer(config, logger, oldconn, conn, &staticFS)
srv := server.NewServer(config, logger, conn, &staticFS)
httpServer := &http.Server{
Addr: net.JoinHostPort(config.Host, config.Port),
Handler: srv,
@@ -104,7 +99,7 @@ func run(ctx context.Context, w io.Writer, args map[string]string) error {
// Runs function for testing in dev if --test flag true
if args["test"] == "true" {
test(config, logger, oldconn, httpServer)
test(config, logger, conn, httpServer)
return nil
}