Updated TODO

[psmysqlbackup.git] / psmysqlbackup.ps1

diff --git a/psmysqlbackup.ps1 b/psmysqlbackup.ps1
index 31cfd796c5c21df9548784acebe0516114d07e10..ce17ca3af6004ea30e84e6945247bcbc9a0929e4 100644 (file)
--- a/psmysqlbackup.ps1
+++ b/psmysqlbackup.ps1
@@ -30,6 +30,7 @@ $configRotate = 7
 # Directory where to store the logfiles
 $configLogDir = "log"
 # Number of logfiles to keep, set to 0 to keep all logfiles
+# You should set this to at least the same as $configRotate
 $configLogRotate = 7
 
 # Databases to backup, leave empty to backup all databases
@@ -176,23 +177,34 @@ function Create-Backup([String]$database, [String]$target) {
         throw "mysqldump exited with Exit code $LastExitCode"
     }
 }
-
-function Rotate-Backups($backupDir) {
-    if($configRotate -le 0) {
+function Invoke-FileRotation {
+    Param (
+        $Dir,
+        $MaxFiles,
+        [Parameter(Mandatory=$false)]
+        $Pattern,
+        [Parameter(Mandatory=$false)]
+        $LogFile
+    )
+
+    if($MaxFiles -le 0) {
         return
     }
-    
-    $keepBackupsCount = $configRotate
 
-    Get-ChildItem $backupDir -File | Where-Object {($_.Name -match "^backup-.+-\d{8,}-\d{6}\.sql$")} | Sort-Object -Descending |
+    $keepFilesCount = $MaxFiles
+
+    Get-ChildItem $Dir -File | Where-Object {($null -eq $Pattern -or $_.Name -match $Pattern)} | Sort-Object -Descending |
     Foreach-Object {
-        if($keepBackupsCount -ge 0) {
-            $keepBackupsCount--
+        if($keepFilesCount -ge 0) {
+            $keepFilesCount--
         }
 
-        if($keepBackupsCount -eq -1) {
-            Write-Output "Deleting backup $($_.FullName)"
-            #Write-Log "Deleting backup $($_.FullName)"
+        if($keepFilesCount -eq -1) {
+            Write-Output "Deleting file $($_.FullName)"
+            
+            if($null -ne $LogFile) {
+                Write-Log "Deleting file $($_.FullName)" -Path $LogFile
+            }
 
             Remove-Item -Force $_.FullName
         }
@@ -282,7 +294,7 @@ foreach($d in $databasesToBackup) {
     
     try {
         Create-Backup $d $databaseBackupFile
-        Rotate-Backups $databaseBackupDir
+        Invoke-FileRotation -Dir $databaseBackupDir -MaxFiles $configRotate -Pattern "^backup-.+-\d{8,}-\d{6}\.sql$" -LogFile $logFile
     }
     catch {
         Write-Log "Could not backup database $d to $databaseBackupFile" -Path $logFile -Level Error
@@ -293,5 +305,7 @@ foreach($d in $databasesToBackup) {
     }
 }
 
+Invoke-FileRotation -Dir $configLogDir -MaxFiles $configLogRotate -Pattern "^log-\d{8,}-\d{6}\.log$" -LogFile $logFile
+
 $endTime = Get-Date -format "yyyy-MM-dd HH:mm:ss"
 Write-Log "Ended at $endTime" -Path $logFile
\ No newline at end of file