diff --git a/backend/app/service/backup_app.go b/backend/app/service/backup_app.go index 67a6e601d..11195d4e7 100644 --- a/backend/app/service/backup_app.go +++ b/backend/app/service/backup_app.go @@ -153,7 +153,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback if !isRollback { rollbackFile := fmt.Sprintf("%s/original/app/%s_%s.tar.gz", global.CONF.System.BaseDir, install.Name, time.Now().Format("20060102150405")) if err := handleAppBackup(install, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil { - global.LOG.Errorf("backup app %s for rollback before recover failed, err: %v", install.Name, err) + return fmt.Errorf("backup app %s for rollback before recover failed, err: %v", install.Name, err) } defer func() { if !isOk { diff --git a/backend/app/service/backup_database.go b/backend/app/service/backup_database.go index 8601abdb8..189e856e7 100644 --- a/backend/app/service/backup_database.go +++ b/backend/app/service/backup_database.go @@ -146,7 +146,7 @@ func handleMysqlRecover(mysqlInfo *repo.RootInfo, recoverDir, dbName, fileName s if !isRollback { rollbackFile := fmt.Sprintf("%s/original/database/%s_%s.sql.gz", global.CONF.System.BaseDir, mysqlInfo.Name, time.Now().Format("20060102150405")) if err := handleMysqlBackup(mysqlInfo, path.Dir(rollbackFile), dbName, path.Base(rollbackFile)); err != nil { - global.LOG.Errorf("backup mysql db %s for rollback before recover failed, err: %v", mysqlInfo.Name, err) + return fmt.Errorf("backup mysql db %s for rollback before recover failed, err: %v", mysqlInfo.Name, err) } defer func() { if !isOk { diff --git a/backend/app/service/backup_redis.go b/backend/app/service/backup_redis.go index a1d0f4f7e..9ef0771bd 100644 --- a/backend/app/service/backup_redis.go +++ b/backend/app/service/backup_redis.go @@ -119,7 +119,7 @@ func handleRedisRecover(redisInfo *repo.RootInfo, recoverFile string, isRollback } rollbackFile := fmt.Sprintf("%s/original/database/redis/%s_%s.%s", global.CONF.System.BaseDir, redisInfo.Name, time.Now().Format("20060102150405"), suffix) if err := handleRedisBackup(redisInfo, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil { - global.LOG.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err) + return fmt.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err) } defer func() { if !isOk { diff --git a/backend/app/service/backup_website.go b/backend/app/service/backup_website.go index a16bef157..24eeafedd 100644 --- a/backend/app/service/backup_website.go +++ b/backend/app/service/backup_website.go @@ -103,7 +103,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback if !isRollback { rollbackFile := fmt.Sprintf("%s/original/website/%s_%s.tar.gz", global.CONF.System.BaseDir, website.Alias, time.Now().Format("20060102150405")) if err := handleWebsiteBackup(website, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil { - global.LOG.Errorf("backup website %s for rollback before recover failed, err: %v", website.Alias, err) + return fmt.Errorf("backup website %s for rollback before recover failed, err: %v", website.Alias, err) } defer func() { if !isOk { diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue index 1b158fab4..4c009f402 100644 --- a/frontend/src/views/container/container/index.vue +++ b/frontend/src/views/container/container/index.vue @@ -316,7 +316,7 @@ const buttons = [ { label: i18n.global.t('commons.button.log'), click: (row: Container.ContainerInfo) => { - dialogContainerLogRef.value!.acceptParams({ containerID: row.containerID }); + dialogContainerLogRef.value!.acceptParams({ containerID: row.containerID, container: row.name }); }, }, ]; diff --git a/frontend/src/views/host/monitor/index.vue b/frontend/src/views/host/monitor/index.vue index 6274c01a4..455bc3f33 100644 --- a/frontend/src/views/host/monitor/index.vue +++ b/frontend/src/views/host/monitor/index.vue @@ -21,7 +21,7 @@ :start-placeholder="$t('commons.search.timeStart')" :end-placeholder="$t('commons.search.timeEnd')" :shortcuts="shortcuts" - style="float: right" + style="float: right; width: 330px" >
@@ -41,7 +41,7 @@ :start-placeholder="$t('commons.search.timeStart')" :end-placeholder="$t('commons.search.timeEnd')" :shortcuts="shortcuts" - style="float: right" + style="float: right; width: 330px" >
@@ -59,7 +59,7 @@ :start-placeholder="$t('commons.search.timeStart')" :end-placeholder="$t('commons.search.timeEnd')" :shortcuts="shortcuts" - style="float: right" + style="float: right; width: 330px" >
@@ -79,16 +79,30 @@ :start-placeholder="$t('commons.search.timeStart')" :end-placeholder="$t('commons.search.timeEnd')" :shortcuts="shortcuts" - style="float: right" + style="float: right; width: 330px" > -
+
- - - -
@@ -649,3 +652,13 @@ onBeforeUnmount(() => { window.removeEventListener('resize', changeChartSize); }); + +