neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update migration tool for ffmpeg version 6

Browse Source
This commit is contained in:
Ingo Oppermann 2024-03-01 12:40:02 +01:00
parent 4f4fb64279
commit ebcde477eb
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/ffmigrate/main.go
View File

@ -34,13 +34,13 @@ func main() {
os.Exit(1)
}
if err := doMigration(logger, configstore); err != nil {
if err := doMigration(logger, diskfs, configstore); err != nil {
logger.Error().WithError(err).Log("Migration failed")
os.Exit(1)
}
}
func doMigration(logger log.Logger, configstore cfgstore.Store) error {
func doMigration(logger log.Logger, fs fs.Filesystem, configstore cfgstore.Store) error {
if logger == nil {
logger = log.New("")
}
@ -95,7 +95,8 @@ func doMigration(logger log.Logger, configstore cfgstore.Store) error {
// Load the existing DB
datastore, err := jsonstore.New(jsonstore.Config{
Filepath: cfg.DB.Dir + "/db.json",
Filesystem: fs,
Filepath: cfg.DB.Dir + "/db.json",
})
if err != nil {
logger.Error().WithField("db", dbFilepath).WithError(err).Log("Creating JSON store failed")
@ -115,7 +116,10 @@ func doMigration(logger log.Logger, configstore cfgstore.Store) error {
for domain, procs := range data.Process {
for id, p := range procs {
ok, err := migrateProcessConfig(logger.WithField("processid", p.Process.ID), p.Process.Config, version.String())
ok, err := migrateProcessConfig(logger.WithFields(log.Fields{
"processid": p.Process.ID,
"domain": domain,
}), p.Process.Config, version.String())
if err != nil {
logger.Info().WithField("processid", p.Process.ID).WithError(err).Log("Migrating process failed")
return fmt.Errorf("migrating process failed: %w", err)