smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Thu Feb 20 2025 Brian Read <brianr@koozali.org> 11.0.0-56.sme

Browse Source 
- open db in routes for backup controller file  [SME: 12933]
- Fix error handling for pre-backup fail [SME:
This commit is contained in:
Brian Read
2025-02-20 14:35:09 +00:00
parent a5758b4431
commit 34b85b1cde
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
View File

@@ -1847,7 +1847,7 @@ sub showSize {
} ## end sub showSize
sub desktopBackupRecordStatus {
my ($backup, $phase, $status) = @_;
my ($c,$backup, $phase, $status) = @_;
my $now = time();
warn("Backup terminated: $phase failed - status: $status\n");
$backup->set_prop('EndEpochTime', "$now");

9
root/usr/share/smanager/themes/default/templates/backdown.html.ep
View File

@@ -11,9 +11,8 @@
# The events handle cases where mysqld is not enabled, and/or is not running.
my $status = system("/sbin/e-smith/signal-event", "pre-backup", "desktop");
if ($status) {
desktopBackupRecordStatus($backup_rec, 'pre-backup', $status);
return ($c->l('bac_OPERATION_STATUS_REPORT').
$c->l('bac_ERR_PRE_BACKUP'));
$c->desktopBackupRecordStatus($backup_rec, 'pre-backup', $status);
return ($c->l('bac_OPERATION_STATUS_REPORT').$c->l('bac_ERR_PRE_BACKUP'));
}
my $clvl = $c->stash('compressionlevel');
@@ -45,8 +44,8 @@
# Remove the dumped tables.
$status = system("/sbin/e-smith/signal-event", "post-backup", "desktop");
if ($status) {
desktopBackupRecordStatus($backup_rec, 'post-backup', $status);
die ($c->l('bac_ERR_POST_BACKUP'),"\n");
$c->desktopBackupRecordStatus($backup_rec, 'post-backup', $status);
die ($c->l('bac_ERR_POST_BACKUP'),"\n");
}
$now = time();