diff --git a/module/instance/control.php b/module/instance/control.php index f752a6c696..b03b9b01c2 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -673,7 +673,9 @@ class instance extends control if(empty($instances)) return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['NoCleanBackupFiles'])); /* Cycle cleaning backup. */ - foreach($instances as $instance) $this->instance->cleanBackup($instance); + $sysUser = new stdclass; + $sysUser->account = 'system'; + foreach($instances as $instance) $this->instance->cleanBackup($instance, $sysUser); return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['cleanBackupSuccess'])); } diff --git a/module/instance/model.php b/module/instance/model.php index 258c364e30..bd45d65353 100644 --- a/module/instance/model.php +++ b/module/instance/model.php @@ -1386,11 +1386,11 @@ class instanceModel extends model /** * 清理备份 * Cleanup Backup. - * - * @param $instance - * @return void + * @param object $instance + * @param object $user + * @return bool */ - public function cleanBackup(object $instance): bool + public function cleanBackup(object $instance, object $user): bool { $instance->spaceData = $this->dao->select('*')->from(TABLE_SPACE)->where('id')->eq($instance->space)->fetch(); @@ -1418,7 +1418,7 @@ class instanceModel extends model array_push($deleteData, array('instanceId' => $instance->id, 'instanceName' => $instance->name, 'backupName' => $backupName, 'backupCreateTime' => $backup->create_time, 'cneResult' => $cneResult)); } } - if(count($deleteData) > 0) $this->action->create('instance', $instance->id, 'deleteexpiredbackup', '', json_encode(array('result' => 'success', 'data' => $deleteData))); + if(count($deleteData) > 0) $this->action->create('instance', $instance->id, 'deleteexpiredbackup', '', json_encode(array('result' => 'success', 'data' => $deleteData), $user->account)); return true; }