Optionaler, automatischer FCGI-Restart nach Request bei Programmänderungen

[mfinanz.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index e728976936a8d34936c37c32bbdcc2013ebdb737..0071e813777345d1ea484d0dfc55b95d748a8de2 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -12,6 +12,10 @@ use Config::Std;
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);

+use File::Basename;
+use List::MoreUtils qw(all);
+use List::Util qw(first);
+use POSIX;

 use SL::Auth;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Auth;
 use SL::LXDebug;
 use SL::LxOfficeConf;


@@ -20,13 +24,13 @@ use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;
 use SL::Template::Plugin::HTMLFixes;
 use SL::Form;
 use SL::Helper::DateTime;
 use SL::Template::Plugin::HTMLFixes;

-use List::Util qw(first);
-use File::Basename;

 
 # Trailing new line is added so that Perl will not add the line
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
 
 # Trailing new line is added so that Perl will not add the line
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 

+my %fcgi_file_cache;
+

 sub new {
   my ($class, $interface) = @_;
 
 sub new {
   my ($class, $interface) = @_;
 


@@ -73,6 +77,8 @@ sub show_error {
 }
 
 sub pre_startup_setup {
 }
 
 sub pre_startup_setup {

+  my ($self) = @_;
+

   SL::LxOfficeConf->read;
   _init_environment();
 
   SL::LxOfficeConf->read;
   _init_environment();
 


@@ -94,7 +100,9 @@ sub pre_startup_setup {
 
   $SIG{__WARN__} = sub {
     $::lxdebug->warn(@_);
 
   $SIG{__WARN__} = sub {
     $::lxdebug->warn(@_);

-  }
+  };
+
+  $self->_cache_file_modification_times;

 }
 
 sub pre_startup_checks {
 }
 
 sub pre_startup_checks {


@@ -102,8 +110,9 @@ sub pre_startup_checks {
 }
 
 sub pre_startup {
 }
 
 sub pre_startup {

-  pre_startup_setup();
-  pre_startup_checks();
+  my ($self) = @_;
+  $self->pre_startup_setup;
+  $self->pre_startup_checks;

 }
 
 sub require_main_code {
 }
 
 sub require_main_code {


@@ -164,6 +173,11 @@ sub handle_request {
   $::form        = Form->new;
   %::called_subs = ();
 
   $::form        = Form->new;
   %::called_subs = ();
 

+  my $session_result = $::auth->restore_session;
+  $::auth->create_or_refresh_session;
+
+  $::form->read_cgi_input;
+

   eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
 
   if ($routing_type eq 'old') {
   eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
 
   if ($routing_type eq 'old') {


@@ -180,15 +194,12 @@ sub handle_request {
     $::form->{script} = "controller.pl";
   }
 
     $::form->{script} = "controller.pl";
   }
 

-  pre_request_checks();
-

   eval {
   eval {

-    my $session_result = $::auth->restore_session;
-    $::auth->create_or_refresh_session;
+    pre_request_checks();

 
     $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
 
 
     $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
 

-    if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
+    if ($script eq 'login' or $script eq 'admin') {

       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($session_result);
 
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($session_result);
 


@@ -202,7 +213,7 @@ sub handle_request {
 
       show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
 
 
       show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
 

-      $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password});
+      $::auth->store_credentials_in_session(login => $::form->{login}, password => $::form->{password});

       $::auth->create_or_refresh_session;
       $::auth->delete_session_value('FLASH');
       delete $::form->{password};
       $::auth->create_or_refresh_session;
       $::auth->delete_session_value('FLASH');
       delete $::form->{password};


@@ -225,21 +236,26 @@ sub handle_request {
     1;
   } or do {
     if ($EVAL_ERROR ne END_OF_REQUEST) {
     1;
   } or do {
     if ($EVAL_ERROR ne END_OF_REQUEST) {

+      print STDERR $EVAL_ERROR;

       $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
       eval { show_error('generic/error') };
     }
   };
 
   # cleanup
       $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
       eval { show_error('generic/error') };
     }
   };
 
   # cleanup

+  $::auth->save_session;
+  $::auth->expire_sessions;
+  $::auth->reset;
+

   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;

-  $::auth->expire_session_keys->save_session;
-  $::auth->expire_sessions;
-  $::auth->reset;

 
   $::lxdebug->end_request;
 
   $::lxdebug->end_request;

+
+  $self->_watch_for_changed_files;
+

   $::lxdebug->leave_sub;
 }
 
   $::lxdebug->leave_sub;
 }
 


@@ -315,6 +331,35 @@ sub _route_controller_request {
   return ($controller, $action);
 }
 
   return ($controller, $action);
 }
 

+sub _cache_file_modification_times {
+  my ($self) = @_;
+
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};
+
+  require File::Find;
+  require POSIX;
+
+  my $wanted = sub {
+    return unless $File::Find::name =~ m/\.(?:pm|f?pl|html|conf|conf\.default)$/;
+    $fcgi_file_cache{ $File::Find::name } = (stat $File::Find::name)[9];
+  };
+
+  my $cwd = POSIX::getcwd();
+  File::Find::find($wanted, map { "${cwd}/${_}" } qw(config bin SL templates/webpages));
+  map { my $name = "${cwd}/${_}"; $fcgi_file_cache{$name} = (stat $name)[9] } qw(admin.pl dispatcher.fpl);
+}
+
+sub _watch_for_changed_files {
+  my ($self) = @_;
+
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};
+
+  my $ok = all { (stat($_))[9] == $fcgi_file_cache{$_} } keys %fcgi_file_cache;
+  return if $ok;
+  $::lxdebug->message(LXDebug::DEBUG1(), "Program modifications detected. Restarting.");
+  exit;
+}
+

 sub get_standard_filehandles {
   my $self = shift;
 
 sub get_standard_filehandles {
   my $self = shift;