From: Eric Bollengier Date: Fri, 4 Jul 2008 12:33:07 +0000 (+0000) Subject: ebl Add catalog to messages resource X-Git-Tag: Release-3.0.0~1192 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4dc3b7567862cad5770d278369708a3c3732dfd8;p=bacula%2Fbacula ebl Add catalog to messages resource git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7302 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/scripts/bacula-dir-2client.conf.in b/regress/scripts/bacula-dir-2client.conf.in index 636cfaa43e..06e529e88b 100644 --- a/regress/scripts/bacula-dir-2client.conf.in +++ b/regress/scripts/bacula-dir-2client.conf.in @@ -251,6 +251,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -261,6 +262,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir-2d.conf.in b/regress/scripts/bacula-dir-2d.conf.in index 8a4080bff8..515bec1a29 100644 --- a/regress/scripts/bacula-dir-2d.conf.in +++ b/regress/scripts/bacula-dir-2d.conf.in @@ -132,6 +132,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -142,6 +143,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir-fifo.conf.in b/regress/scripts/bacula-dir-fifo.conf.in index 8da99203d4..0241e70265 100644 --- a/regress/scripts/bacula-dir-fifo.conf.in +++ b/regress/scripts/bacula-dir-fifo.conf.in @@ -180,6 +180,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -190,6 +191,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in index 9f25ac994b..5bd22d8c75 100644 --- a/regress/scripts/bacula-dir-migration.conf.in +++ b/regress/scripts/bacula-dir-migration.conf.in @@ -193,6 +193,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -203,6 +204,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir-strip.conf.in b/regress/scripts/bacula-dir-strip.conf.in index 46e89dd6a5..fc1588218d 100644 --- a/regress/scripts/bacula-dir-strip.conf.in +++ b/regress/scripts/bacula-dir-strip.conf.in @@ -186,6 +186,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index 5a581bbb8e..f92dadb6e7 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -220,6 +220,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -230,6 +231,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in index 082e7ecbf3..9216618847 100644 --- a/regress/scripts/bacula-dir-win32-tape.conf.in +++ b/regress/scripts/bacula-dir-win32-tape.conf.in @@ -122,6 +122,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -132,6 +133,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/bacula-dir.conf.accurate.in b/regress/scripts/bacula-dir.conf.accurate.in index 1f6d99f4ce..2d7cfdecb1 100644 --- a/regress/scripts/bacula-dir.conf.accurate.in +++ b/regress/scripts/bacula-dir.conf.accurate.in @@ -130,6 +130,7 @@ Catalog { Messages { Name = Standard console = all, !skipped, saved + catalog = all, !skipped } # Default pool definition diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in index 5e57e3c7cf..c4e9151039 100644 --- a/regress/scripts/bacula-dir.conf.errors.in +++ b/regress/scripts/bacula-dir.conf.errors.in @@ -212,6 +212,7 @@ Catalog { Messages { Name = Standard console = all, !skipped, !saved + catalog = all, !skipped } # Default pool definition diff --git a/regress/scripts/bacula-dir.conf.maxtime.in b/regress/scripts/bacula-dir.conf.maxtime.in index 5f9d1da94d..5223327c76 100644 --- a/regress/scripts/bacula-dir.conf.maxtime.in +++ b/regress/scripts/bacula-dir.conf.maxtime.in @@ -115,6 +115,7 @@ Catalog { Messages { Name = Standard console = all, !skipped, !saved + catalog = all, !skipped } # Default pool definition diff --git a/regress/scripts/bacula-dir.conf.regexwhere.in b/regress/scripts/bacula-dir.conf.regexwhere.in index d1af63cefc..b37e912674 100644 --- a/regress/scripts/bacula-dir.conf.regexwhere.in +++ b/regress/scripts/bacula-dir.conf.regexwhere.in @@ -125,6 +125,7 @@ Catalog { Messages { Name = Standard console = all, !skipped, !saved + catalog = all, !skipped } # Default pool definition diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in index 617ab8ca17..b6a4042d56 100644 --- a/regress/scripts/bacula-dir.conf.testrunscript.in +++ b/regress/scripts/bacula-dir.conf.testrunscript.in @@ -59,6 +59,17 @@ Job { ClientRunAfterJob = "/bin/echo ClientRunAfterJob" } +Job { + Name = "RUN_SUBST" + JobDefs = DefaultJob + FileSet = FS_TESTJOB + RunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t" + ClientRunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t" + ClientRunAfterJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t" + Run After Job = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t vol=%v status=%e" +} + + #After job are after before job Job { Name = "RUN_DIR_FAILED_BUG" @@ -235,6 +246,7 @@ Catalog { Messages { Name = Standard console = all, !skipped, !saved + catalog = all, !skipped } # Default pool definition diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in index fad158694e..fab97c6070 100644 --- a/regress/scripts/multi-client-bacula-dir.conf.in +++ b/regress/scripts/multi-client-bacula-dir.conf.in @@ -343,6 +343,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -355,6 +356,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in index af69036150..736fe99fb8 100644 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -458,6 +458,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -470,6 +471,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in index 69833a4374..1bb046c398 100644 --- a/regress/scripts/test-bacula-dir.conf.in +++ b/regress/scripts/test-bacula-dir.conf.in @@ -279,6 +279,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -291,6 +292,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in index cd956931f2..84f1a4420d 100644 --- a/regress/scripts/testa-bacula-dir.conf.in +++ b/regress/scripts/testa-bacula-dir.conf.in @@ -117,6 +117,7 @@ Messages { console = all, !skipped, !terminate append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -124,6 +125,7 @@ Messages { mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r" console = all, !skipped, !terminate, !restored append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/testb-bacula-dir.conf.in b/regress/scripts/testb-bacula-dir.conf.in index e85afacb75..1382848294 100644 --- a/regress/scripts/testb-bacula-dir.conf.in +++ b/regress/scripts/testb-bacula-dir.conf.in @@ -121,6 +121,7 @@ Messages { console = all, !skipped, !terminate append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -128,6 +129,7 @@ Messages { mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r" console = all, !skipped, !terminate, !restored append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/tls-auth-bacula-dir.conf.in b/regress/scripts/tls-auth-bacula-dir.conf.in index 01aee907c6..ca99e2ccf9 100644 --- a/regress/scripts/tls-auth-bacula-dir.conf.in +++ b/regress/scripts/tls-auth-bacula-dir.conf.in @@ -357,6 +357,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -369,6 +370,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in index bd6c965a25..cc179cf6bc 100644 --- a/regress/scripts/tls-bacula-dir.conf.in +++ b/regress/scripts/tls-bacula-dir.conf.in @@ -354,6 +354,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } Messages { @@ -366,6 +367,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/win32-bacula-dir-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in index be11cb6355..327e9971d9 100644 --- a/regress/scripts/win32-bacula-dir-tape.conf.in +++ b/regress/scripts/win32-bacula-dir-tape.conf.in @@ -136,6 +136,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -146,6 +147,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } diff --git a/regress/scripts/win32-bacula-dir.conf.in b/regress/scripts/win32-bacula-dir.conf.in index 4b8e901da6..d8cbe04407 100644 --- a/regress/scripts/win32-bacula-dir.conf.in +++ b/regress/scripts/win32-bacula-dir.conf.in @@ -136,6 +136,7 @@ Messages { # also keep all your messages if the scroll off the console. # append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped } # @@ -146,6 +147,7 @@ Messages { # mail = @job_email@ = all, !skipped console = all, !skipped, !saved append = "@working_dir@/log" = all, !skipped + catalog = all, !skipped }