michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up schedule backup cron job on DB deletion

Browse Source
This commit is contained in:
Jamie Cameron
2014-09-01 14:37:24 -07:00
parent aaecbcbc62
commit e2fc6b848d
5 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql/CHANGELOG
View File

@@ -101,3 +101,5 @@ Added confirmation before deleting multiple user, host, database, table and colu
Added fields to the Edit User page for setting the maximum concurrent logins and operations per hour for users.
Scheduled MySQL backups can now have their success or failure sent via email, via new options on the Backup Database page.
When executing SQL or restoring a backup file, the character set can now be selected for the imported data.
---- Changes since 1.700 ----
When a database is deleted, any cron job for backing it up is also removed.

2
postgresql/CHANGELOG
View File

@@ -74,3 +74,5 @@ Added greater than / less than selectors to the table data search form.
---- Changes since 1.530 ----
Added an option to the restore form to limit the restore to only certain tables.
When creating a new database, a template database to copy from can now be selected.
---- Changes since 1.700 ----
When a database is deleted, any cron job for backing it up is also removed.

1
postgresql/drop_dbase.cgi
View File

@@ -9,6 +9,7 @@ require './postgresql-lib.pl';
if ($in{'confirm'}) {
# Drop the database
&execute_sql_logged($config{'basedb'}, "drop database \"$in{'db'}\"");
&delete_database_backup_job($in{'db'});
&webmin_log("delete", "db", $in{'db'});
&redirect("");
}

1
postgresql/drop_dbases.cgi
View File

@@ -12,6 +12,7 @@ if ($in{'confirm'}) {
# Drop the databases
foreach $db (@dbs) {
&execute_sql_logged($config{'basedb'}, "drop database \"$db\"");
&delete_database_backup_job($db);
}
&webmin_log("delete", "dbs", scalar(@dbs));
&redirect("");

16
postgresql/postgresql-lib.pl
View File

@@ -1249,5 +1249,21 @@ else {
return @rv;
}
# delete_database_backup_job(db)
# If there is a backup scheduled for some database, remove it
sub delete_database_backup_job
{
my ($db) = @_;
&foreign_require("cron");
my @jobs = &cron::list_cron_jobs();
my $cmd = "$cron_cmd $db";
my ($job) = grep { $_->{'command'} eq $cmd } @jobs;
if ($job) {
&lock_file(&cron::cron_file($job));
&cron::delete_cron_job($job);
&unlock_file(&cron::cron_file($job));
}
}
1;