Skip to content

Commit 7fa3968

Browse files
fix: Fixed issue where original Compose file content was cleared during comparison (#10880)
1 parent 9d84120 commit 7fa3968

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

agent/app/service/cronjob_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (u *CronjobService) handleCleanLog(cronjob model.Cronjob, taskItem *task.Ta
243243
}
244244
appInstall, _ := getAppInstallByKey(constant.AppOpenresty)
245245
if appInstall.ID > 0 {
246-
curStr := i18n.GetWithName("CleanLogByName", "Openresty")
246+
curStr := i18n.GetWithName("CleanLogByName", "OpenResty")
247247
t.LogStart(curStr)
248248
accessLogPath := path.Join(appInstall.GetPath(), "log", "access.log")
249249
if err := os.Truncate(accessLogPath, 0); err != nil {

frontend/src/views/app-store/installed/detail/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ const composeDiffRef = ref();
208208
const rawCompose = ref('');
209209
210210
const getNewCompose = (compose: string) => {
211-
paramModel.dockerCompose = compose;
211+
if (compose != '') {
212+
paramModel.dockerCompose = compose;
213+
}
212214
};
213215
214216
const openDiff = () => {

0 commit comments

Comments
 (0)