projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beim Neuanlegen von Artikeln aus Beleg heraus $::form in Session speichern
[kivitendo-erp.git]
/
scripts
/
task_server.pl
diff --git
a/scripts/task_server.pl
b/scripts/task_server.pl
index
843419f
..
c2061b7
100755
(executable)
--- a/
scripts/task_server.pl
+++ b/
scripts/task_server.pl
@@
-16,7
+16,6
@@
BEGIN {
}
use CGI qw( -no_xhtml);
}
use CGI qw( -no_xhtml);
-use Config::Std;
use Cwd;
use Daemon::Generic;
use Data::Dumper;
use Cwd;
use Daemon::Generic;
use Data::Dumper;
@@
-29,6
+28,7
@@
use SL::BackgroundJob::ALL;
use SL::Form;
use SL::Helper::DateTime;
use SL::LXDebug;
use SL::Form;
use SL::Helper::DateTime;
use SL::LXDebug;
+use SL::LxOfficeConf;
use SL::Locale;
our %lx_office_conf;
use SL::Locale;
our %lx_office_conf;
@@
-42,11
+42,8
@@
sub lxinit {
package main;
package main;
- 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;
$::lxdebug = LXDebug->new;
- $::locale = Locale->new($::l
anguage
);
+ $::locale = Locale->new($::l
x_office_conf{system}->{language}
);
$::cgi = CGI->new qw();
$::form = Form->new;
$::auth = SL::Auth->new;
$::cgi = CGI->new qw();
$::form = Form->new;
$::auth = SL::Auth->new;
@@
-92,7
+89,7
@@
sub drop_privileges {
sub gd_preconfig {
my $self = shift;
sub gd_preconfig {
my $self = shift;
-
read_config $self->{configfile} => %lx_office_conf
;
+
SL::LxOfficeConf->read
;
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};
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};
@@
-115,7
+112,7
@@
sub gd_run {
foreach my $job (@{ $jobs }) {
# Provide fresh global variables in case legacy code modifies
# them somehow.
foreach my $job (@{ $jobs }) {
# Provide fresh global variables in case legacy code modifies
# them somehow.
- $::locale = Locale->new($::l
anguage
);
+ $::locale = Locale->new($::l
x_office_conf{system}->{language}
);
$::form = Form->new;
$job->run;
$::form = Form->new;
$job->run;
@@
-139,7
+136,8
@@
my $pidbase = "${cwd}/users/pid";
mkdir($pidbase) if !-d $pidbase;
mkdir($pidbase) if !-d $pidbase;
-newdaemon(configfile => "${cwd}/config/lx_office.conf",
+my $file = -f "${cwd}/config/lx_office.conf" ? "${cwd}/config/lx_office.conf" : "${cwd}/config/lx_office.conf.default";
+newdaemon(configfile => $file,
progname => 'lx-office-task-server',
pidbase => "${pidbase}/",
);
progname => 'lx-office-task-server',
pidbase => "${pidbase}/",
);