X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Ftask_server.pl;h=eb407cb35543c6e6973cf3f0857506a2d17034a9;hb=8d8d1aab328b1c47d7983aca59c1c99592336eff;hp=2460e1b56007a024643dd72417ec573a16617231;hpb=88e5a86ec8d02e0fcc98a3fbefff39f0a6ba1427;p=kivitendo-erp.git diff --git a/scripts/task_server.pl b/scripts/task_server.pl index 2460e1b56..eb407cb35 100755 --- a/scripts/task_server.pl +++ b/scripts/task_server.pl @@ -2,60 +2,52 @@ use strict; -BEGIN { - require Cwd; +my $exe_dir; - my $dir = $0; - $dir = Cwd::getcwd() . '/' . $dir unless $dir =~ m|^/|; - $dir =~ s|[^/]+$|..|; +BEGIN { + use SL::System::Process; + $exe_dir = SL::System::Process::exe_dir; - chdir($dir) || die "Cannot change directory to ${dir}\n"; + 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; - unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). - push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. + chdir($exe_dir) || die "Cannot change directory to ${exe_dir}\n"; } use CGI qw( -no_xhtml); -use Config::Std; use Cwd; use Daemon::Generic; use Data::Dumper; use DateTime; use English qw(-no_match_vars); +use File::Spec; +use List::Util qw(first); use POSIX qw(setuid setgid); use SL::Auth; use SL::DB::BackgroundJob; use SL::BackgroundJob::ALL; use SL::Form; use SL::Helper::DateTime; +use SL::InstanceConfiguration; use SL::LXDebug; +use SL::LxOfficeConf; use SL::Locale; +use SL::System::TaskServer; -my %config; +our %lx_office_conf; -# this is a cleaned up version of am.pl -# it lacks redirection, some html setup and most of the authentication process. -# it is assumed that anyone with physical access and execution rights on this script -# won't be hindered by authentication anyway. sub lxinit { - my $login = $config{task_server}->{login}; + my $login = $lx_office_conf{task_server}->{login}; package main; - { no warnings 'once'; - $::userspath = "users"; - $::templates = "templates"; - $::sendmail = "| /usr/sbin/sendmail -t"; - } - - eval { require "config/lx-erp.conf"; 1; } or die $EVAL_ERROR; - eval { require "config/lx-erp-local.conf"; 1; } or die $EVAL_ERROR if -f "config/lx-erp-local.conf"; - - $::lxdebug = LXDebug->new; - $::locale = Locale->new($::language); - $::cgi = CGI->new qw(); - $::form = Form->new; - $::auth = SL::Auth->new; + $::lxdebug = LXDebug->new; + $::locale = Locale->new($::lx_office_conf{system}->{language}); + $::form = Form->new; + $::auth = SL::Auth->new; + $::instance_conf = SL::InstanceConfiguration->new; + $::request = { cgi => CGI->new({}) }; die 'cannot reach auth db' unless $::auth->session_tables_present; @@ -63,12 +55,12 @@ sub lxinit { require "bin/mozilla/common.pl"; - die "cannot find user $login" unless %::myconfig = $::auth->read_user($login); + die "cannot find user $login" unless %::myconfig = $::auth->read_user(login => $login); die "cannot find locale for user $login" unless $::locale = Locale->new('de'); } sub drop_privileges { - my $user = $::emmvee_conf{task_server}->{run_as}; + my $user = $lx_office_conf{task_server}->{run_as}; return unless $user; my ($uid, $gid); @@ -98,10 +90,10 @@ sub drop_privileges { sub gd_preconfig { my $self = shift; - read_config $self->{configfile} => %config; + SL::LxOfficeConf->read($self->{configfile}); - die "Missing section [task_server] in config file" unless $config{task_server}; - die "Missing key 'login' in section [task_server] in config file" unless $config{task_server}->{login}; + die "Missing section [task_server] in config file" unless $lx_office_conf{task_server}; + die "Missing key 'login' in section [task_server] in config file" unless $lx_office_conf{task_server}->{login}; drop_privileges(); lxinit(); @@ -112,35 +104,58 @@ sub gd_preconfig { sub gd_run { while (1) { my $ok = eval { - $::lxdebug->message(0, "Retrieving jobs") if $config{task_server}->{debug}; + $::lxdebug->message(0, "Retrieving jobs") if $lx_office_conf{task_server}->{debug}; my $jobs = SL::DB::Manager::BackgroundJob->get_all_need_to_run; - $::lxdebug->message(0, " Found: " . join(' ', map { $_->package_name } @{ $jobs })) if $config{task_server}->{debug} && @{ $jobs }; + $::lxdebug->message(0, " Found: " . join(' ', map { $_->package_name } @{ $jobs })) if $lx_office_conf{task_server}->{debug} && @{ $jobs }; + + foreach my $job (@{ $jobs }) { + # Provide fresh global variables in case legacy code modifies + # them somehow. + $::locale = Locale->new($::lx_office_conf{system}->{language}); + $::form = Form->new; - $_->run for @{ $jobs }; + chdir $exe_dir; + + $job->run; + } 1; }; - if ($config{task_server}->{debug}) { + if ($lx_office_conf{task_server}->{debug}) { $::lxdebug->message(0, "Exception during execution: ${EVAL_ERROR}") if !$ok; $::lxdebug->message(0, "Sleeping"); } my $seconds = 60 - (localtime)[0]; - sleep($seconds < 30 ? $seconds + 60 : $seconds); + if (!eval { + local $SIG{'ALRM'} = sub { + $::lxdebug->message(0, "Got woken up by SIGALRM") if $lx_office_conf{task_server}->{debug}; + die "Alarm!\n" + }; + sleep($seconds < 30 ? $seconds + 60 : $seconds); + 1; + }) { + die $@ unless $@ eq "Alarm!\n"; + } } } -my $cwd = getcwd(); -my $pidbase = "${cwd}/users/pid"; +chdir $exe_dir; + +mkdir SL::System::TaskServer::PID_BASE() if !-d SL::System::TaskServer::PID_BASE(); + +my $file = first { -f } ("${exe_dir}/config/kivitendo.conf", "${exe_dir}/config/lx_office.conf", "${exe_dir}/config/kivitendo.conf.default"); + +die "No configuration file found." unless $file; -mkdir($pidbase) if !-d $pidbase; +$file = File::Spec->abs2rel(Cwd::abs_path($file), Cwd::abs_path($exe_dir)); -newdaemon(configfile => "${cwd}/config/task_server.conf", - progname => 'lx-office-task-server', - pidbase => "${pidbase}/", +newdaemon(configfile => $file, + progname => 'kivitendo-task-server', + pidbase => SL::System::TaskServer::PID_BASE() . '/', ); 1;