Compare commits

..

2 Commits

Author SHA1 Message Date
gitea-actions[bot] 4a3826314f chore(version): pre-release bump to 01.45.04-dev [skip ci] 2026-06-29 14:35:43 +00:00
jmiller 1f387039a0 fix: mark backup as warning when remote upload fails, show failure reason
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 34s
- Add 'warning' status for backups where the archive was created
  successfully but remote upload failed (SFTP, FTP, S3, GDrive)
- Add status_message column to records table storing the specific
  failure reason without needing to read the full log
- Display warning badge (yellow) with failure details in backup list
  and detail views
- Include warning-status backups in dashboard stats, retention
  cleanup, and archive browser/download actions
- Add filter option for warning status in backups list
- Add uploadErrors tracking to SteppedSession for multi-step backups

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG
2026-06-29 09:34:53 -05:00
25 changed files with 98 additions and 37 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
# FILE INFORMATION
# DEFGROUP: Gitea.Workflow
# INGROUP: mokocli.Automation
# VERSION: 01.00.00
# VERSION: 01.45.04
# BRIEF: Auto-create feature branch when an issue is opened
name: "Universal: Issue Branch"
+1 -1
View File
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
INGROUP: Template-Joomla.Documentation
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
PATH: /SECURITY.md
VERSION: 01.45.00
VERSION: 01.45.04
BRIEF: Security vulnerability reporting and handling policy
-->
@@ -15,6 +15,7 @@
>
<option value="">COM_MOKOJOOMBACKUP_FILTER_STATUS_ALL</option>
<option value="complete">COM_MOKOJOOMBACKUP_STATUS_COMPLETE</option>
<option value="warning">COM_MOKOJOOMBACKUP_STATUS_WARNING</option>
<option value="running">COM_MOKOJOOMBACKUP_STATUS_RUNNING</option>
<option value="fail">COM_MOKOJOOMBACKUP_STATUS_FAIL</option>
<option value="pending">COM_MOKOJOOMBACKUP_STATUS_PENDING</option>
@@ -207,6 +207,7 @@ COM_MOKOJOOMBACKUP_TYPE_DIFFERENTIAL="Differential (changed files + full DB)"
; Status labels
COM_MOKOJOOMBACKUP_STATUS_COMPLETE="Complete"
COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
COM_MOKOJOOMBACKUP_STATUS_RUNNING="Running"
COM_MOKOJOOMBACKUP_STATUS_FAIL="Failed"
COM_MOKOJOOMBACKUP_STATUS_PENDING="Pending"
@@ -7,7 +7,7 @@
-->
<extension type="component" method="upgrade">
<name>MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`profile_id` INT(11) UNSIGNED NOT NULL DEFAULT 1,
`description` VARCHAR(255) NOT NULL DEFAULT '',
`status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, fail',
`status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, warning, fail',
`origin` VARCHAR(20) NOT NULL DEFAULT 'backend' COMMENT 'backend, cli, api, scheduled',
`backup_type` VARCHAR(20) NOT NULL DEFAULT 'full' COMMENT 'full, database, files',
`archivename` VARCHAR(512) NOT NULL DEFAULT '',
@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
`checksum` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'SHA-256 hash of archive',
`base_record_id` INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Base full backup ID for differential',
`manifest` LONGTEXT DEFAULT NULL COMMENT 'JSON file manifest for differential comparison',
`status_message` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Short user-facing status detail (e.g. upload failure reason)',
`log` MEDIUMTEXT DEFAULT NULL COMMENT 'Step-by-step backup log',
PRIMARY KEY (`id`),
KEY `idx_profile` (`profile_id`),
@@ -0,0 +1 @@
ALTER TABLE `#__mokosuitebackup_records` ADD COLUMN `status_message` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Short user-facing status detail (e.g. upload failure reason)' AFTER `log`;
@@ -0,0 +1 @@
/* 01.45.04 — no schema changes */
@@ -285,8 +285,9 @@ class BackupEngine
$this->log('Standalone ' . $restoreScriptName . ' generated (' . number_format(filesize($restoreScriptPath)) . ' bytes)');
}
$remoteFilename = '';
$uploadFailed = false;
$remoteFilename = '';
$uploadFailed = false;
$uploadErrors = [];
/* Step 3: Remote upload — iterate all enabled destinations */
$remotes = $this->loadRemoteDestinations($db, $profileId);
@@ -308,10 +309,12 @@ class BackupEngine
}
} else {
$uploadFailed = true;
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $result['message'];
$this->log(' WARNING: Upload failed: ' . $result['message']);
}
} catch (\Throwable $e) {
$uploadFailed = true;
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $e->getMessage();
$this->log(' WARNING: Upload exception: ' . $e->getMessage());
}
}
@@ -354,11 +357,13 @@ class BackupEngine
}
} else {
$uploadFailed = true;
$uploadErrors[] = $remoteStorage . ': ' . $uploadResult['message'];
$this->log('WARNING: Remote upload failed: ' . $uploadResult['message']);
$this->log('Local backup is preserved.');
}
} catch (\Throwable $e) {
$uploadFailed = true;
$uploadErrors[] = $remoteStorage . ': ' . $e->getMessage();
$this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
$this->log('Local backup is preserved.');
}
@@ -372,10 +377,20 @@ class BackupEngine
error_log('MokoSuiteBackup: Could not write log file: ' . $logPath);
}
$statusMessage = '';
if ($uploadFailed) {
$statusMessage = 'Remote upload failed: ' . implode('; ', $uploadErrors);
if (strlen($statusMessage) > 512) {
$statusMessage = substr($statusMessage, 0, 509) . '...';
}
}
// Final record update (includes fields needed by NotificationSender)
$update = (object) [
'id' => $recordId,
'status' => 'complete',
'status' => $uploadFailed ? 'warning' : 'complete',
'status_message' => $statusMessage,
'description' => $description,
'backup_type' => $profile->backup_type,
'archivename' => $archiveName,
@@ -451,6 +451,7 @@ class SteppedBackupEngine
$db = Factory::getDbo();
$remoteFilename = '';
$uploadFailed = false;
$uploadErrors = $session->uploadErrors ?? [];
if (!empty($session->remoteDestinations)) {
// ── Multi-remote path ──────────────────────────────────
@@ -485,13 +486,16 @@ class SteppedBackupEngine
}
} else {
$uploadFailed = true;
$uploadErrors[] = ($title) . ': ' . $result['message'];
$session->log(' WARNING: Upload failed: ' . $result['message']);
}
} catch (\Throwable $e) {
$uploadFailed = true;
$uploadErrors[] = ($title ?? $type) . ': ' . $e->getMessage();
$session->log(' WARNING: Upload exception: ' . $e->getMessage());
}
$session->uploadErrors = $uploadErrors;
$session->remoteIndex++;
$session->currentStep++;
@@ -517,7 +521,7 @@ class SteppedBackupEngine
$session->statusMessage = $uploadFailed
? 'Backup complete (some remote uploads failed — local archive preserved)'
: 'Backup complete';
$this->completeRecord($session, $uploadFailed);
$this->completeRecord($session, $uploadFailed, $uploadErrors);
}
} else {
// ── Legacy single-remote fallback ──────────────────────
@@ -557,11 +561,13 @@ class SteppedBackupEngine
}
} else {
$uploadFailed = true;
$uploadErrors[] = $session->remoteStorage . ': ' . $result['message'];
$session->log('WARNING: Remote upload failed: ' . $result['message']);
$session->log('Local backup is preserved.');
}
} catch (\Throwable $e) {
$uploadFailed = true;
$uploadErrors[] = $session->remoteStorage . ': ' . $e->getMessage();
$session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
$session->log('Local backup is preserved.');
}
@@ -580,7 +586,7 @@ class SteppedBackupEngine
$session->statusMessage = $uploadFailed
? 'Backup complete (remote upload failed — local archive preserved)'
: 'Backup complete';
$this->completeRecord($session, $uploadFailed);
$this->completeRecord($session, $uploadFailed, $uploadErrors);
}
}
@@ -631,7 +637,7 @@ class SteppedBackupEngine
/**
* Mark the backup record as complete.
*/
private function completeRecord(SteppedSession $session, bool $uploadFailed = false): void
private function completeRecord(SteppedSession $session, bool $uploadFailed = false, array $uploadErrors = []): void
{
$db = Factory::getDbo();
$logContent = implode("\n", $session->log);
@@ -645,13 +651,23 @@ class SteppedBackupEngine
$totalSize = is_file($session->archivePath) ? filesize($session->archivePath) : 0;
$checksum = is_file($session->archivePath) ? hash_file('sha256', $session->archivePath) : '';
$statusMessage = '';
if ($uploadFailed && !empty($uploadErrors)) {
$statusMessage = 'Remote upload failed: ' . implode('; ', $uploadErrors);
if (strlen($statusMessage) > 512) {
$statusMessage = substr($statusMessage, 0, 509) . '...';
}
}
$update = (object) [
'id' => $session->recordId,
'status' => 'complete',
'backupend' => date('Y-m-d H:i:s'),
'total_size' => $totalSize,
'checksum' => $checksum,
'log' => $logContent,
'id' => $session->recordId,
'status' => $uploadFailed ? 'warning' : 'complete',
'status_message' => $statusMessage,
'backupend' => date('Y-m-d H:i:s'),
'total_size' => $totalSize,
'checksum' => $checksum,
'log' => $logContent,
];
$db->updateObject('#__mokosuitebackup_records', $update, 'id');
@@ -60,6 +60,7 @@ class SteppedSession
// Multi-remote destinations (loaded from #__mokosuitebackup_remotes)
public array $remoteDestinations = [];
public int $remoteIndex = 0;
public array $uploadErrors = [];
// Progress
public int $totalSteps = 0;
@@ -30,7 +30,7 @@ class DashboardModel extends BaseDatabaseModel
->select('r.*, p.title AS profile_title')
->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
->order($db->quoteName('r.backupend') . ' DESC');
$db->setQuery($query, 0, 1);
@@ -75,7 +75,7 @@ class DashboardModel extends BaseDatabaseModel
->select('COUNT(*) AS total_count')
->select('COALESCE(SUM(' . $db->quoteName('total_size') . '), 0) AS total_size')
->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
->where($db->quoteName('status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
$db->setQuery($query);
$stats = $db->loadObject();
@@ -274,7 +274,7 @@ class DashboardModel extends BaseDatabaseModel
->select('COALESCE(SUM(r.total_size), 0) AS total_size')
->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
->group($db->quoteName('r.profile_id'))
->order('total_size DESC');
$db->setQuery($query);
@@ -30,12 +30,23 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
<?php
$statusClass = match ($this->item->status) {
'complete' => 'badge bg-success',
'warning' => 'badge bg-warning text-dark',
'running' => 'badge bg-info',
'fail' => 'badge bg-danger',
default => 'badge bg-secondary',
};
$statusLabel = match ($this->item->status) {
'complete' => Text::_('COM_MOKOJOOMBACKUP_STATUS_COMPLETE'),
'warning' => Text::_('COM_MOKOJOOMBACKUP_STATUS_WARNING'),
'running' => Text::_('COM_MOKOJOOMBACKUP_STATUS_RUNNING'),
'fail' => Text::_('COM_MOKOJOOMBACKUP_STATUS_FAIL'),
default => $this->escape($this->item->status),
};
?>
<span class="<?php echo $statusClass; ?>"><?php echo $this->escape($this->item->status); ?></span>
<span class="<?php echo $statusClass; ?>"><?php echo $statusLabel; ?></span>
<?php if (!empty($this->item->status_message)) : ?>
<div class="mt-1"><small class="text-danger"><?php echo $this->escape($this->item->status_message); ?></small></div>
<?php endif; ?>
</td>
</tr>
<tr>
@@ -94,7 +105,7 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
</tbody>
</table>
<?php if ($this->item->status === 'complete' && !empty($this->item->filesexist)) : ?>
<?php if (in_array($this->item->status, ['complete', 'warning']) && !empty($this->item->filesexist)) : ?>
<!-- Archive Browser -->
<h4 class="mt-4">
<span class="icon-folder-open" aria-hidden="true"></span>
@@ -153,7 +164,7 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
document.getElementById('mb-detail-log-body').textContent = 'Error: ' + err.message;
});
<?php if ($this->item->status === 'complete' && !empty($this->item->filesexist)) : ?>
<?php if (in_array($this->item->status, ['complete', 'warning']) && !empty($this->item->filesexist)) : ?>
// Load archive contents
function formatFileSize(bytes) {
if (bytes === 0) return '0 B';
@@ -92,12 +92,23 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php
$statusClass = match ($item->status) {
'complete' => 'badge bg-success',
'warning' => 'badge bg-warning text-dark',
'running' => 'badge bg-info',
'fail' => 'badge bg-danger',
default => 'badge bg-secondary',
};
$statusLabel = match ($item->status) {
'complete' => Text::_('COM_MOKOJOOMBACKUP_STATUS_COMPLETE'),
'warning' => Text::_('COM_MOKOJOOMBACKUP_STATUS_WARNING'),
'running' => Text::_('COM_MOKOJOOMBACKUP_STATUS_RUNNING'),
'fail' => Text::_('COM_MOKOJOOMBACKUP_STATUS_FAIL'),
default => $this->escape($item->status),
};
?>
<span class="<?php echo $statusClass; ?>"><?php echo $this->escape($item->status); ?></span>
<span class="<?php echo $statusClass; ?>"><?php echo $statusLabel; ?></span>
<?php if (!empty($item->status_message)) : ?>
<br><small class="text-muted"><?php echo $this->escape($item->status_message); ?></small>
<?php endif; ?>
</td>
<td>
<?php echo $this->escape($item->backup_type); ?>
@@ -8,7 +8,7 @@
-->
<extension type="module" client="administrator" method="upgrade">
<name>mod_mokosuitebackup_cpanel</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-23</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="actionlog" method="upgrade">
<name>Action Log - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="console" method="upgrade">
<name>Console - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="content" method="upgrade">
<name>Content - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="quickicon" method="upgrade">
<name>Quick Icon - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="system" method="upgrade">
<name>System - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -259,6 +259,8 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
$maxCount = (int) $profile->retention_count > 0 ? (int) $profile->retention_count : $globalMaxCount;
$pid = (int) $profile->id;
$completedStatuses = '(' . $db->quote('complete') . ', ' . $db->quote('warning') . ')';
// Delete by age for this profile
$cutoff = date('Y-m-d H:i:s', strtotime("-{$maxAge} days"));
$query = $db->getQuery(true)
@@ -266,7 +268,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff))
->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
->where($db->quoteName('status') . ' IN ' . $completedStatuses);
$db->setQuery($query);
$expired = $db->loadObjectList();
@@ -279,7 +281,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->select('COUNT(*)')
->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
->where($db->quoteName('status') . ' IN ' . $completedStatuses);
$db->setQuery($query);
$totalCount = (int) $db->loadResult();
@@ -289,7 +291,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->select('id, absolute_path')
->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('status') . ' = ' . $db->quote('complete'))
->where($db->quoteName('status') . ' IN ' . $completedStatuses)
->order($db->quoteName('backupstart') . ' ASC');
$db->setQuery($query, 0, $excess);
$oldest = $db->loadObjectList();
@@ -306,7 +308,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where('p.id IS NULL')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'));
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
$db->setQuery($query);
$orphans = $db->loadObjectList();
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="task" method="upgrade">
<name>Task - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
-->
<extension type="plugin" group="webservices" method="upgrade">
<name>Web Services - MokoSuiteBackup</name>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
+1 -1
View File
@@ -8,7 +8,7 @@
<extension type="package" method="upgrade">
<name>Package - MokoSuiteBackup</name>
<packagename>mokosuitebackup</packagename>
<version>01.45.00</version>
<version>01.45.04</version>
<creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>