[Box Backup-commit] COMMIT r2239 - box/trunk/bin/bbackupd/win32

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-08-11 16:30:52 +0100 (Mon, 11 Aug 2008)
New Revision: 2239

Modified:
   box/trunk/bin/bbackupd/win32/NotifySysAdmin.vbs
Log:
Add handling of backup-error events to NotifySysAdmin.vbs.

Fix spelling errors.


Modified: box/trunk/bin/bbackupd/win32/NotifySysAdmin.vbs
===================================================================
--- box/trunk/bin/bbackupd/win32/NotifySysAdmin.vbs	2008-08-11 09:34:50 UTC (rev 2238)
+++ box/trunk/bin/bbackupd/win32/NotifySysAdmin.vbs	2008-08-11 15:30:52 UTC (rev 2239)
@@ -10,44 +10,61 @@
 Set WshNet = CreateObject("WScript.Network")
 hostname = WshNet.ComputerName
 
-account = "0a1"
+account = "0x1"
 from = "boxbackup@" & hostname
 sendto = "admin at example.com"
+smtpserver = "smtp.example.com"
 subjtmpl = "BACKUP PROBLEM on host " & hostname
-smtpserver = "smtp.example.com"
 
 Set args = WScript.Arguments
 
 If args(0) = "store-full" Then
 	subject = subjtmpl & " (store full)"
-	body =	"The store account for "&hostname&" is full." & vbCrLf & vbCrLf & _
-			"=============================" & vbCrLf & _
-			"FILES ARE NOT BEING BACKED UP" & vbCrLf & _
-			"=============================" & vbCrLf & vbCrLf & _
-			"Please adjust the limits on account "&account&" on server "&hostname&"." _
-			& vbCrLf
+	body =	"The store account for "&hostname&" is full." & vbCrLf & _
+		vbCrLf & _
+		"=============================" & vbCrLf & _
+		"FILES ARE NOT BEING BACKED UP" & vbCrLf & _
+		"=============================" & vbCrLf & _
+		vbCrLf & _
+		"Please adjust the limits on account "&account&" on server "&hostname&"." _
+		& vbCrLf
 	SendMail from,sendto,subject,body
 ElseIf args(0) = "read-error" Then
 	subject = subjtmpl & " (read errors)"
-	body =	"Errors occured reading some files or directories for backup on "&hostname&"." _
-			& vbCrLf & vbCrLf & _
-			"===================================" & vbCrLf & _
-			"THESE FILES ARE NOT BEING BACKED UP" & vbCrLf & _
-			"===================================" & vbCrLf & vbCrLf & _
-			"Check the logs on "&hostname&" for the files and directories which caused" & _
-			"these errors, and take appropraite action." & vbCrLf & vbCrLf & _
-			"Other files are being backed up." & vbCrLf
+	body =	"Errors occurred reading some files or directories " & _
+		"for backup on " & hostname & "." _ & vbCrLf & _
+		vbCrLf & _
+		"===================================" & vbCrLf & _
+		"THESE FILES ARE NOT BEING BACKED UP" & vbCrLf & _
+		"===================================" & vbCrLf & vbCrLf & _
+		"Check the logs on "&hostname&" for the files and " & _
+		"directories which caused" & vbCrLf & _
+		"these errors, and take appropriate action." & vbCrLf & _
+		vbCrLf & _
+		"Other files are being backed up." & vbCrLf
 	SendMail from,sendto,subject,body
+ElseIf args(0) = "backup-error" Then
+	subject = subjtmpl & " (read errors)"
+	body =	"An error occurred during the backup on "&hostname&"." _
+		& vbCrLf & vbCrLf & _
+		"==========================" & vbCrLf & _
+		"FILES MAY NOT BE BACKED UP" & vbCrLf & _
+		"==========================" & vbCrLf & _
+		vbCrLf & _
+		"Check the logs on "&hostname&" for more " & _
+		"information about the error, " & vbCrLf & _
+		"and take appropriate action." & vbCrLf
+	SendMail from,sendto,subject,body
 ElseIf args(0) = "backup-start" Or args(0) = "backup-finish" Then
 	' do nothing for these messages by default
 Else
 	subject = subjtmpl & " (unknown)"
 	body =	"The backup daemon on "&hostname&" reported an unknown error." _
-			& vbCrLf & vbCrLf & _
-			"==========================" & vbCrLf & _
-			"FILES MAY NOT BE BACKED UP" & vbCrLf & _
-			"==========================" & vbCrLf & vbCrLf & _
-			"Please check the logs on "&hostname&"." & vbCrLf
+		& vbCrLf & vbCrLf & _
+		"==========================" & vbCrLf & _
+		"FILES MAY NOT BE BACKED UP" & vbCrLf & _
+		"==========================" & vbCrLf & vbCrLf & _
+		"Please check the logs on "&hostname&"." & vbCrLf
 	SendMail from,sendto,subject,body
 End If