X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Ftask_server.pl;h=b1baef42e080e089907d1d151cbc20568b7a8aca;hb=45ff2497af0be84db6bf29613d1dfd54a1c7d91a;hp=f3422d62df31169159dfe8a98db9e4cf9e9b776c;hpb=d7fddb8d59bdcb8ec6bb31572d392fa29a858947;p=kivitendo-erp.git

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index f3422d62d..b1baef42e 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -76,7 +76,7 @@ sub lxinit {
 }
 
 sub per_job_initialization {
-  $::locale        = Locale->new($::lx_office_conf{system}->{language});
+  $::locale        = Locale->new($::myconfig{countrycode} || $::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::instance_conf = SL::InstanceConfiguration->new;
   $::request       = SL::Request->new(
@@ -88,6 +88,8 @@ sub per_job_initialization {
 
   $::form->{login} = $lx_office_conf{task_server}->{login};
   $::instance_conf->init;
+
+  $::form->{__ERROR_HANDLER} = sub { die @_ };
 }
 
 sub drop_privileges {
@@ -223,6 +225,17 @@ sub gd_run {
   }
 }
 
+sub end_of_request {
+  $main::lxdebug->show_backtrace();
+  die <<EOF;
+Job called ::end_of_request()!
+
+This usually indicates success but should not be used by background jobs. A
+backtrace has been logged. Please tell the job author to have a look at it.
+EOF
+
+}
+
 chdir $exe_dir;
 
 mkdir SL::System::TaskServer::PID_BASE() if !-d SL::System::TaskServer::PID_BASE();