| 1 |
snetram |
1.1 |
diff -ruN e-smith-backup-2.0.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar |
| 2 |
|
|
--- e-smith-backup-2.0.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2009-05-16 23:00:49.000000000 +0100 |
| 3 |
|
|
+++ e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar 2009-05-16 14:23:07.000000000 +0100 |
| 4 |
|
|
@@ -78,7 +78,7 @@ |
| 5 |
|
|
$report .= "DAILY BACKUP TO WORKSTATION REPORT \n"; |
| 6 |
|
|
$report .= "================================== \n"; |
| 7 |
|
|
$report .= "Backup started at " .$tim . "\n"; |
| 8 |
|
|
-$report .= "Backup of mysql databases has been done.\n"; |
| 9 |
|
|
+$report .= "Backup of mysql databases has been done\n"; |
| 10 |
|
|
|
| 11 |
|
|
# mounting backup directory |
| 12 |
|
|
|
| 13 |
|
|
@@ -177,10 +177,14 @@ |
| 14 |
|
|
} |
| 15 |
|
|
|
| 16 |
|
|
$report .= "Using set number $setnum of $setsmax\n"; |
| 17 |
|
|
-$report .= "Attempt to " . |
| 18 |
|
|
- ($incnum == 0) ? |
| 19 |
|
|
- "full backup \n" : |
| 20 |
|
|
- "incremental backup number $incnum of $daysinset\n"; |
| 21 |
|
|
+if ($incnum == 0) |
| 22 |
|
|
+{ |
| 23 |
|
|
+ $report .= "Attempt full backup \n"; |
| 24 |
|
|
+} |
| 25 |
|
|
+else |
| 26 |
|
|
+{ |
| 27 |
|
|
+ $report .= "Attempt incremental backup number $incnum of $daysinset\n"; |
| 28 |
|
|
+} |
| 29 |
|
|
|
| 30 |
|
|
# if no set directory, make it |
| 31 |
|
|
my $setname = "set" . $setnum; |
| 32 |
|
|
@@ -235,7 +239,7 @@ |
| 33 |
|
|
} |
| 34 |
|
|
|
| 35 |
|
|
$report .= "Backup base file name is $bkname \n"; |
| 36 |
|
|
-$report .= "Making backup on temporary dir... \n"; |
| 37 |
|
|
+$report .= "Making backup in temp directory\n"; |
| 38 |
|
|
|
| 39 |
|
|
# calculate real timeout if we timeout incrementals only. |
| 40 |
|
|
# timeout of 88500 is a security for aborting backup within 24h |
| 41 |
|
|
@@ -244,7 +248,7 @@ |
| 42 |
|
|
{ |
| 43 |
|
|
$timeout = 88500; |
| 44 |
|
|
} |
| 45 |
|
|
-$report .= "using a backup session timeout of : $timeout seconds\n"; |
| 46 |
|
|
+$report .= "Using a backup session timeout of : $timeout seconds\n"; |
| 47 |
|
|
|
| 48 |
|
|
# expanding backup configuration file template |
| 49 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
