From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 15 Nov 2004 22:44:40 +0000 (+0000)
Subject: Update for new job output
X-Git-Tag: Release-1.36.1~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d355e1f66dce9d6ea0048b648f713f942321c35a;p=bacula%2Fbacula

Update for new job output


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1699 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 48d89b6eb3..9cbb557727 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -20,7 +20,7 @@ Director {                            # define myself
   PidDirectory = "@piddir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"
-  Messages = Standard
+  Messages = Daemon
 }
 
 #
@@ -122,6 +122,16 @@ Messages {
   append = "@working_dir@/log" = all, !skipped
 }
 
+#
+# Message delivery for daemon messages (no job).
+Messages {
+  Name = Daemon
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mail = @job_email@ = all, !skipped            
+  console = all, !skipped, !saved
+  append = "@working_dir@/log" = all, !skipped
+}
+
     
 # Default pool definition
 Pool {
diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 57286c39d6..e13bef2838 100644
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -21,7 +21,7 @@ Director {                            # define myself
   SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
-  Messages = Standard
+  Messages = Daemon
 }
 
 #
@@ -287,6 +287,15 @@ Messages {
   append = "@working_dir@/log" = all, !skipped
 }
 
+#
+# Message delivery for daemon messages (no job).
+Messages {
+  Name = Daemon
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mail = @job_email@ = all, !skipped            
+  console = all, !skipped, !saved
+  append = "@working_dir@/log" = all, !skipped
+}
     
 # Default pool definition
 Pool {
diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 347bb8cbcb..7f248bac82 100755
Binary files a/regress/tests/auto-label-test and b/regress/tests/auto-label-test differ
diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 17478dffa7..4eedff42f8 100755
Binary files a/regress/tests/backup-bacula-tape and b/regress/tests/backup-bacula-tape differ
diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 84dec154af..ecf1d3bef4 100755
Binary files a/regress/tests/backup-bacula-test and b/regress/tests/backup-bacula-test differ
diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 1521ab67a5..8a55c19da0 100755
Binary files a/regress/tests/bextract-test and b/regress/tests/bextract-test differ
diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index de01721b3b..8858b6a877 100755
Binary files a/regress/tests/bscan-tape and b/regress/tests/bscan-tape differ
diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 310a1806c1..3194a65145 100755
Binary files a/regress/tests/bscan-test and b/regress/tests/bscan-test differ
diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 74002e23a4..7284cc1565 100755
Binary files a/regress/tests/bsr-opt-test and b/regress/tests/bsr-opt-test differ
diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index f2032ef7b3..6bd5d415b1 100755
Binary files a/regress/tests/compressed-test and b/regress/tests/compressed-test differ
diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index e15c3ba3c7..1f4deeb592 100755
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -58,9 +58,9 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test
index fc1ce98c12..41b274350b 100755
Binary files a/regress/tests/decremental-test and b/regress/tests/decremental-test differ
diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 36faadf517..23fe49a390 100755
Binary files a/regress/tests/fixed-block-size-tape and b/regress/tests/fixed-block-size-tape differ
diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 48109cbb84..17f9d350f9 100755
Binary files a/regress/tests/four-concurrent-jobs-tape and b/regress/tests/four-concurrent-jobs-tape differ
diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 7d2d5329b0..97772f7127 100755
Binary files a/regress/tests/four-concurrent-jobs-test and b/regress/tests/four-concurrent-jobs-test differ
diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 9d930bf258..90deecfe2e 100755
Binary files a/regress/tests/four-jobs-tape and b/regress/tests/four-jobs-tape differ
diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 2356303c2e..092d88a941 100755
Binary files a/regress/tests/four-jobs-test and b/regress/tests/four-jobs-test differ
diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 6ed796897f..695a033ee0 100755
Binary files a/regress/tests/incremental-2tape and b/regress/tests/incremental-2tape differ
diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 602df9cd60..9a5b39605f 100755
Binary files a/regress/tests/incremental-tape and b/regress/tests/incremental-tape differ
diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index b740ccf0bd..7b0581c254 100755
Binary files a/regress/tests/incremental-test and b/regress/tests/incremental-test differ
diff --git a/regress/tests/query-test b/regress/tests/query-test
index 11a88cb319..4c6523b449 100755
Binary files a/regress/tests/query-test and b/regress/tests/query-test differ
diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 6dbc60c5a5..df8a0ec7de 100755
Binary files a/regress/tests/recycle-test and b/regress/tests/recycle-test differ
diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 21013b36cd..45ff1755f3 100755
Binary files a/regress/tests/restore-by-file-tape and b/regress/tests/restore-by-file-tape differ
diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 9ee9958950..5d1762c138 100755
Binary files a/regress/tests/restore-by-file-test and b/regress/tests/restore-by-file-test differ
diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 76372a363c..c9dba17900 100755
Binary files a/regress/tests/restore-disk-seek-test and b/regress/tests/restore-disk-seek-test differ
diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 53a259889b..3d31a2bad1 100755
Binary files a/regress/tests/restore2-by-file-test and b/regress/tests/restore2-by-file-test differ
diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index bf55e1ae8c..cb10f73143 100755
Binary files a/regress/tests/six-vol-test and b/regress/tests/six-vol-test differ
diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index c98ab38055..9b7fa3faa2 100755
Binary files a/regress/tests/small-file-size-tape and b/regress/tests/small-file-size-tape differ
diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 5136ab9a4f..2b68dc0d9c 100755
Binary files a/regress/tests/span-vol-test and b/regress/tests/span-vol-test differ
diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 11fc42a56a..758ccef9fb 100755
Binary files a/regress/tests/sparse-compressed-test and b/regress/tests/sparse-compressed-test differ
diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index c1c7328bd6..33ee35f738 100755
Binary files a/regress/tests/sparse-test and b/regress/tests/sparse-test differ
diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index e7d110bce1..9ae89ea5a2 100755
Binary files a/regress/tests/two-jobs-test and b/regress/tests/two-jobs-test differ
diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 1a80133461..adef8e4d1e 100755
Binary files a/regress/tests/two-vol-test and b/regress/tests/two-vol-test differ
diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 2f603f9ee7..d33e4e58b2 100755
Binary files a/regress/tests/two-volume-tape and b/regress/tests/two-volume-tape differ
diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 35b404406d..0fcc2ea5b5 100755
Binary files a/regress/tests/verify-vol-test and b/regress/tests/verify-vol-test differ
diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 07aaf8b806..b4623fae5a 100755
Binary files a/regress/tests/weird-files-test and b/regress/tests/weird-files-test differ
diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 0766cc63d6..3d16e77b11 100755
Binary files a/regress/tests/weird-files2-test and b/regress/tests/weird-files2-test differ