streamline response handling and logging
Signed-off-by: Tobias Erbshäußer <tobias@tesoft.dev>
This commit is contained in:
+6
-6
@@ -18,7 +18,7 @@ type Database struct {
|
||||
}
|
||||
|
||||
func NewDatabase(path string, rootPassword string) (*Database, error) {
|
||||
log.Println("Opening database '" + path + "'")
|
||||
log.Println("opening database '" + path + "'")
|
||||
|
||||
db, err := sql.Open("sqlite3", path)
|
||||
if err != nil {
|
||||
@@ -37,7 +37,7 @@ func NewDatabase(path string, rootPassword string) (*Database, error) {
|
||||
func (db *Database) Close() {
|
||||
err := db.db.Close()
|
||||
if err != nil {
|
||||
log.Println("Error closing database:", err.Error())
|
||||
log.Println("error closing database:", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ func migrate(db *sql.DB, rootPassword string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Println("Checking database schema version")
|
||||
log.Println("checking database schema version")
|
||||
var curVersion int
|
||||
err = tx.QueryRow("SELECT version FROM schema_info").Scan(&curVersion)
|
||||
if err != nil {
|
||||
@@ -217,7 +217,7 @@ func migrate(db *sql.DB, rootPassword string) error {
|
||||
}
|
||||
|
||||
if curVersion == -1 {
|
||||
log.Println("Database is empty")
|
||||
log.Println("database is empty")
|
||||
|
||||
err = createV1Tables(tx, rootPassword)
|
||||
if err != nil {
|
||||
@@ -225,7 +225,7 @@ func migrate(db *sql.DB, rootPassword string) error {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
log.Println("Database schema version is", curVersion)
|
||||
log.Println("database schema version is", curVersion)
|
||||
|
||||
if curVersion != 1 {
|
||||
return errors.New("unsupported database schema version")
|
||||
@@ -236,7 +236,7 @@ func migrate(db *sql.DB, rootPassword string) error {
|
||||
}
|
||||
|
||||
func createV1Tables(tx *sql.Tx, rootPassword string) error {
|
||||
log.Println("Creating tables for schema version 1")
|
||||
log.Println("creating tables for schema version 1")
|
||||
|
||||
salt := make([]byte, 32)
|
||||
_, _ = rand.Read(salt)
|
||||
|
||||
Reference in New Issue
Block a user