From 7bf94bf956a0aa5cb77ba8449470864c23964207 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Wed, 23 Mar 2022 20:41:02 +0100 Subject: [PATCH] increase timeout for backup and restore and remap 15m->60m Resolves #1297 --- backend/app/cmd/backup.go | 2 +- backend/app/cmd/import.go | 2 +- backend/app/cmd/remap.go | 2 +- backend/app/cmd/restore.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/app/cmd/backup.go b/backend/app/cmd/backup.go index 4cb1f78415..2c5124a06e 100644 --- a/backend/app/cmd/backup.go +++ b/backend/app/cmd/backup.go @@ -18,7 +18,7 @@ type BackupCommand struct { ExportPath string `short:"p" long:"path" env:"BACKUP_PATH" default:"./var/backup" description:"export path"` ExportFile string `short:"f" long:"file" default:"userbackup-{{.SITE}}-{{.TS}}.gz" description:"file name"` Site string `short:"s" long:"site" env:"SITE" default:"remark" description:"site name"` - Timeout time.Duration `long:"timeout" default:"15m" description:"export (backup) timeout"` + Timeout time.Duration `long:"timeout" default:"60m" description:"export (backup) timeout"` AdminPasswd string `long:"admin-passwd" env:"ADMIN_PASSWD" required:"true" description:"admin basic auth password"` CommonOpts } diff --git a/backend/app/cmd/import.go b/backend/app/cmd/import.go index d0b64bda85..a7b990a86c 100644 --- a/backend/app/cmd/import.go +++ b/backend/app/cmd/import.go @@ -19,7 +19,7 @@ type ImportCommand struct { InputFile string `short:"f" long:"file" description:"input file name" required:"true"` Provider string `short:"p" long:"provider" default:"disqus" choice:"disqus" choice:"wordpress" choice:"commento" description:"import format"` //nolint Site string `short:"s" long:"site" env:"SITE" default:"remark" description:"site name"` - Timeout time.Duration `long:"timeout" default:"15m" description:"import timeout"` + Timeout time.Duration `long:"timeout" default:"60m" description:"import timeout"` AdminPasswd string `long:"admin-passwd" env:"ADMIN_PASSWD" required:"true" description:"admin basic auth password"` CommonOpts } diff --git a/backend/app/cmd/remap.go b/backend/app/cmd/remap.go index f5022592eb..10bead5fc3 100644 --- a/backend/app/cmd/remap.go +++ b/backend/app/cmd/remap.go @@ -18,7 +18,7 @@ type RemapCommand struct { Site string `short:"s" long:"site" env:"SITE" default:"remark" description:"site name"` InputFile string `short:"f" long:"file" description:"input file name" required:"true"` AdminPasswd string `long:"admin-passwd" env:"ADMIN_PASSWD" required:"true" description:"admin basic auth password"` - Timeout time.Duration `long:"timeout" default:"15m" description:"remap timeout"` + Timeout time.Duration `long:"timeout" default:"60m" description:"remap timeout"` CommonOpts } diff --git a/backend/app/cmd/restore.go b/backend/app/cmd/restore.go index eeefa2b3f1..e12f78c4d3 100644 --- a/backend/app/cmd/restore.go +++ b/backend/app/cmd/restore.go @@ -12,7 +12,7 @@ type RestoreCommand struct { ImportFile string `short:"f" long:"file" default:"userbackup-{{.SITE}}-{{.YYYYMMDD}}.gz" description:"file name" required:"true"` Site string `short:"s" long:"site" env:"SITE" default:"remark" description:"site name"` - Timeout time.Duration `long:"timeout" default:"15m" description:"import timeout"` + Timeout time.Duration `long:"timeout" default:"60m" description:"import timeout"` AdminPasswd string `long:"admin-passwd" env:"ADMIN_PASSWD" required:"true" description:"admin basic auth password"` CommonOpts }