SelfTest - bessere Fehlerbehandlung für Einbinden der Test-Module

Fehlermeldung an den TaskServer zurückgeben.
Fehlermeldung(en) in der Status-E-Mail hinzufügen.

diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm
index 5145625..2f88833 100644 (file)
--- a/SL/BackgroundJob/SelfTest.pm
+++ b/SL/BackgroundJob/SelfTest.pm
@@ -13,6 +13,8 @@ use FindBin;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::Common;
+use SL::Locale::String qw(t8);
+use Carp;
 
 use Rose::Object::MakeMethods::Generic (
   array => [
@@ -66,6 +68,7 @@ sub run {
     $self->_send_email;
   }
 
+  croak t8("Unsuccessfully executed:" . join ("\n", $self->errors)) if $self->errors;
   return 1;
 }
 
@@ -156,6 +159,7 @@ sub _prepare_report {
     database => $::auth->client->{dbname},
     client   => $::auth->client->{name},
     path     => $FindBin::Bin,
+    errors   => $self->errors,
   );
 
   my $output;

diff --git a/templates/mail/self_test/status_mail.txt b/templates/mail/self_test/status_mail.txt
index 7c3d306..ac83cce 100644 (file)
--- a/templates/mail/self_test/status_mail.txt
+++ b/templates/mail/self_test/status_mail.txt
@@ -1,5 +1,10 @@
 kivitendo selftest report.
 
+[% IF errors %]
+  General error(s) have occured.
+  [% errors %]
+[% END %]
+
 Host:   [% host %]
 Path:   [% path %]
 DB:     [% database %]