Created variables for file regexes

diff --git a/psmysqlbackup.ps1 b/psmysqlbackup.ps1
index ce17ca3af6004ea30e84e6945247bcbc9a0929e4..d5eacb16a73d8c91be861c082334c0db7f865273 100644 (file)
--- a/psmysqlbackup.ps1
+++ b/psmysqlbackup.ps1
@@ -213,6 +213,9 @@ function Invoke-FileRotation {
 
 $defaultDbExclude = @("information_schema", "performance_schema")
 
 
 $defaultDbExclude = @("information_schema", "performance_schema")
 

+$patternBackupFile = "^backup-.+-\d{8,}-\d{6}\.sql$"
+$patternLogFile = "^log-\d{8,}-\d{6}\.log$"
+

 $currDaytime = Get-Date -format "yyyyMMdd-HHmmss"
 
 $logFile = "$configLogDir\log-$currDaytime.log"
 $currDaytime = Get-Date -format "yyyyMMdd-HHmmss"
 
 $logFile = "$configLogDir\log-$currDaytime.log"


@@ -294,7 +297,7 @@ foreach($d in $databasesToBackup) {
     
     try {
         Create-Backup $d $databaseBackupFile
     
     try {
         Create-Backup $d $databaseBackupFile

-        Invoke-FileRotation -Dir $databaseBackupDir -MaxFiles $configRotate -Pattern "^backup-.+-\d{8,}-\d{6}\.sql$" -LogFile $logFile
+        Invoke-FileRotation -Dir $databaseBackupDir -MaxFiles $configRotate -Pattern $patternBackupFile -LogFile $logFile

     }
     catch {
         Write-Log "Could not backup database $d to $databaseBackupFile" -Path $logFile -Level Error
     }
     catch {
         Write-Log "Could not backup database $d to $databaseBackupFile" -Path $logFile -Level Error


@@ -305,7 +308,7 @@ foreach($d in $databasesToBackup) {
     }
 }
 
     }
 }
 

-Invoke-FileRotation -Dir $configLogDir -MaxFiles $configLogRotate -Pattern "^log-\d{8,}-\d{6}\.log$" -LogFile $logFile
+Invoke-FileRotation -Dir $configLogDir -MaxFiles $configLogRotate -Pattern $patternLogFile -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
 
 $endTime = Get-Date -format "yyyy-MM-dd HH:mm:ss"
 Write-Log "Ended at $endTime" -Path $logFile
\ No newline at end of file