Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 6 Pull requests Releases Activity

Verbessere Logging und Fehlerbehandlung

Browse source
This commit is contained in:
Gonne 2022-09-21 22:24:08 +02:00
parent c737818ce4
commit 6e97d867de
14 changed files with 223 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sqldb/sqldb.go
View file

@ -3,14 +3,13 @@ package sqldb
import (
"database/sql"
"fmt"
"log"
"officeHours/config"
_ "github.com/go-sql-driver/mysql"
_ "github.com/mattn/go-sqlite3"
)
func Connect(config config.Config) *sql.DB {
func Connect(config config.Config) (*sql.DB, error) {
switch config.SQL.Type {
case "SQLite":
return connectSQLite(config.SQL.SQLiteFile)
@ -21,30 +20,28 @@ func Connect(config config.Config) *sql.DB {
config.SQL.MysqlPort,
config.SQL.MysqlDatabase)
default:
log.Fatal("Type of database not recognised.")
return nil, fmt.Errorf("Type of database not recognised: %s", config.SQL.Type)
}
return nil
}
func connectSQLite(file string) *sql.DB {
func connectSQLite(file string) (*sql.DB, error) {
db, err := sql.Open("sqlite3", file)
if err != nil {
log.Fatal(err)
return db, fmt.Errorf("Error opening SQLite database: %w", err)
}
return db
return db, nil
}
func connectMysql(user string, password string, address string, port int, database string) *sql.DB {
func connectMysql(user string, password string, address string, port int, database string) (*sql.DB, error) {
db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/%s", user, password, address, port, database))
if err != nil {
log.Fatalf("Error connecting to database: %s", err)
return db, fmt.Errorf("Error connecting to Mysql database: %w", err)
}
err = db.Ping()
// handle error
if err != nil {
log.Fatalf("Error pinging database: %s", err)
return db, fmt.Errorf("Error pinging Mysql database: %w", err)
}
return db
return db, nil
}