gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-08-18 07:36:24 -07:00
Code Releases Activity

Include stack trace in MigrateBoards recovery log, replace old stuff in IsMigrated with common.TableExists

Browse source
This commit is contained in:
Eggbertx 2024-12-31 17:16:25 -08:00
parent 2e91aeb0a4
commit 3d15c272e9
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/gochan-migration/internal/pre2021/boards.go
View file

@ -2,10 +2,13 @@ package pre2021
import (
"errors"
"runtime/debug"
"strings"
"time"
"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
"github.com/gochan-org/gochan/pkg/gcsql"
"github.com/rs/zerolog"
)
type boardTable struct {
@ -44,7 +47,7 @@ func (m *Pre2021Migrator) createSectionIfNotExist(sectionCheck *gcsql.Section) (
section, err := gcsql.GetSectionFromName(sectionCheck.Name)
if errors.Is(err, gcsql.ErrSectionDoesNotExist) {
// section doesn't exist, create it
section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, section.Hidden, section.Position)
section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, true, 0)
if err != nil {
return 0, err
}
@ -174,7 +177,16 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
func (m *Pre2021Migrator) MigrateBoards() error {
defer func() {
if r := recover(); r != nil {
common.LogFatal().Interface("recover", r).Msg("Recovered from panic in MigrateBoards")
stackTrace := debug.Stack()
traceLines := strings.Split(string(stackTrace), "\n")
zlArr := zerolog.Arr()
for _, line := range traceLines {
zlArr.Str(line)
}
common.LogFatal().Caller().
Interface("recover", r).
Array("stackTrace", zlArr).
Msg("Recovered from panic in MigrateBoards")
}
}()
if m.IsMigratingInPlace() {

34
cmd/gochan-migration/internal/pre2021/pre2021.go
View file

@ -2,8 +2,10 @@
package pre2021
import (
"context"
"encoding/json"
"os"
"time"
"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
"github.com/gochan-org/gochan/pkg/config"
@ -24,6 +26,7 @@ type Pre2021Migrator struct {
posts []postTable
oldBoards map[string]boardTable
newBoards map[string]boardTable
threads map[int]int // old thread id (previously stored in posts as the id) to new thread id (threads.id)
}
// IsMigratingInPlace implements common.DBMigrator.
@ -36,48 +39,34 @@ func (m *Pre2021Migrator) readConfig() error {
if err != nil {
return err
}
m.config.SQLConfig = config.GetSQLConfig()
return json.Unmarshal(ba, &m.config)
}
func (m *Pre2021Migrator) Init(options *common.MigrationOptions) error {
m.options = options
var err error
m.config.SQLConfig = config.GetSQLConfig()
if err = m.readConfig(); err != nil {
return err
}
m.config.DBTimeoutSeconds = config.DefaultSQLTimeout
m.config.DBMaxOpenConnections = config.DefaultSQLMaxConns
m.config.DBMaxIdleConnections = config.DefaultSQLMaxConns
m.config.DBConnMaxLifetimeMin = config.DefaultSQLConnMaxLifetimeMin
m.db, err = gcsql.Open(&m.config.SQLConfig)
return err
}
func (m *Pre2021Migrator) IsMigrated() (bool, error) {
var migrated bool
var err error
var query string
switch m.config.DBtype {
case "mysql":
fallthrough
case "postgres":
query = `SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_NAME = ? AND TABLE_SCHEMA = ?`
default:
return false, gcsql.ErrUnsupportedDB
}
if err = m.db.QueryRowSQL(query,
[]interface{}{m.config.DBprefix + "database_version", m.config.DBname},
[]interface{}{&migrated}); err != nil {
return migrated, err
}
return migrated, err
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(m.config.DBTimeoutSeconds)*time.Second)
defer cancel()
return common.TableExists(ctx, m.db, nil, "DBPREFIXdatabase_version", &m.config.SQLConfig)
}
func (m *Pre2021Migrator) MigrateDB() (bool, error) {
errEv := common.LogError()
defer errEv.Discard()
migrated, err := m.IsMigrated()
if err != nil {
errEv.Caller().Err(err).Msg("Error checking if database is migrated")
return false, err
}
if migrated {
@ -87,6 +76,7 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
}
if err := m.MigrateBoards(); err != nil {
errEv.Caller().Err(err).Msg("Failed to migrate boards")
return false, err
}
common.LogInfo().Msg("Migrated boards")