OrderController: nach Speichern hiddens der ids wieder setzen, …

[mfinanz.git] / scripts / task_server.pl

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index f22ce13b07afb3359f21ca7462e4b3bed9494ba9..3674eac768114130f3e07050a1751aa1eb665b24 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -1,24 +1,14 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-
-use List::MoreUtils qw(any);
-

 use strict;
 
 my $exe_dir;
 
 BEGIN {
   use FindBin;
 use strict;
 
 my $exe_dir;
 
 BEGIN {
   use FindBin;

-  use lib "$FindBin::Bin/..";
-
-  use SL::System::Process;
-  $exe_dir = SL::System::Process::exe_dir;
-
-  unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
-  unshift @INC, $exe_dir;

 
 

-  chdir($exe_dir) || die "Cannot change directory to ${exe_dir}\n";
+  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
+  push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.

 }
 
 use CGI qw( -no_xhtml);
 }
 
 use CGI qw( -no_xhtml);


@@ -26,11 +16,11 @@ use Cwd;
 use Daemon::Generic;
 use Data::Dumper;
 use DateTime;
 use Daemon::Generic;
 use Data::Dumper;
 use DateTime;

-use Encode qw();

 use English qw(-no_match_vars);
 use File::Spec;
 use English qw(-no_match_vars);
 use File::Spec;

+use List::MoreUtils qw(any);

 use List::Util qw(first);
 use List::Util qw(first);

-use POSIX qw(setuid setgid);
+use POSIX qw(setlocale setuid setgid);

 use SL::Auth;
 use SL::DBUpgrade2;
 use SL::DB::AuthClient;
 use SL::Auth;
 use SL::DBUpgrade2;
 use SL::DB::AuthClient;


@@ -43,6 +33,7 @@ use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::Mailer;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::Mailer;

+use SL::System::Process;

 use SL::System::TaskServer;
 use Template;
 
 use SL::System::TaskServer;
 use Template;
 


@@ -165,6 +156,7 @@ sub notify_on_failure {
     EVAL_PERL   => 0,
     ABSOLUTE    => 1,
     CACHE_SIZE  => 0,
     EVAL_PERL   => 0,
     ABSOLUTE    => 1,
     CACHE_SIZE  => 0,

+    ENCODING    => 'utf8',

   });
 
   return debug("Could not create Template instance") unless $template;
   });
 
   return debug("Could not create Template instance") unless $template;


@@ -181,7 +173,7 @@ sub notify_on_failure {
       subject      => $cfg->{email_subject},
       content_type => 'text/plain',
       charset      => 'utf-8',
       subject      => $cfg->{email_subject},
       content_type => 'text/plain',
       charset      => 'utf-8',

-      message      => Encode::decode('utf-8', $body),
+      message      => $body,

     )->send;
 
     1;
     )->send;
 
     1;


@@ -193,6 +185,11 @@ sub notify_on_failure {
 sub gd_preconfig {
   my $self = shift;
 
 sub gd_preconfig {
   my $self = shift;
 

+  # Initialize character type locale to be UTF-8 instead of C:
+  foreach my $locale (qw(de_DE.UTF-8 en_US.UTF-8)) {
+    last if setlocale('LC_CTYPE', $locale);
+  }
+

   SL::LxOfficeConf->read($self->{configfile});
 
   die "Missing section [task_server] in config file" unless $lx_office_conf{task_server};
   SL::LxOfficeConf->read($self->{configfile});
 
   die "Missing section [task_server] in config file" unless $lx_office_conf{task_server};


@@ -253,6 +250,10 @@ sub run_once_for_all_clients {
 
         my $history = $job->run;
 
 
         my $history = $job->run;
 

+        debug("   Executed job " . $job->package_name .
+              "; result: " . (!$history ? "no return value" : $history->has_failed ? "failed" : "succeeded") .
+              ($history && $history->has_failed ? "; error: " . $history->error_col : ""));
+

         notify_on_failure(history => $history) if $history && $history->has_failed;
       }
 
         notify_on_failure(history => $history) if $history && $history->has_failed;
       }
 


@@ -294,7 +295,8 @@ sub gd_run {
   }
 }
 
   }
 }
 

-chdir $exe_dir;
+$exe_dir = SL::System::Process->exe_dir;
+chdir($exe_dir) || die "Cannot change directory to ${exe_dir}\n";

 
 mkdir SL::System::TaskServer::PID_BASE() if !-d SL::System::TaskServer::PID_BASE();
 
 
 mkdir SL::System::TaskServer::PID_BASE() if !-d SL::System::TaskServer::PID_BASE();