X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/70242f1ef13bab60b55ae219c479d3fcfc3bacb2..24f6b9ed716e385fa26ca68b1d78bd1969b22fcd:/SL/Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index e8725b5f3..ec6da1beb 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -22,7 +22,9 @@ use Config::Std;
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);
+use FCGI;
 use File::Basename;
+use IO::File;
 use List::MoreUtils qw(all);
 use List::Util qw(first);
 use SL::ArchiveZipFixes;
@@ -221,6 +223,22 @@ sub _run_controller {
   "SL::Controller::$_[0]"->new->_run_action($_[1]);
 }
 
+sub handle_all_requests {
+  my ($self) = @_;
+
+  my $restart;
+  my $request = FCGI::Request();
+  while ($request->Accept() >= 0) {
+    $self->handle_request($request);
+    if (($self->interface_type eq 'FastCGI') && _memory_usage_is_too_high()) {
+      $request->LastCall();
+      $restart = 1;
+    }
+  }
+
+  exec $0 if $restart;
+}
+
 sub handle_request {
   my $self         = shift;
   $self->{request} = shift;
@@ -324,7 +342,7 @@ sub handle_request {
     $self->{request}->Finish;
   }
 
-  $::lxdebug->end_request;
+  $::lxdebug->end_request(routing_type => $routing_type, script_name => $script_name, action => $action);
 
   # cleanup
   $::auth->save_session;
@@ -335,6 +353,8 @@ sub handle_request {
   $::form     = undef;
   $::myconfig = ();
   $::request  = undef;
+
+  SL::DBConnect::Cache->reset_all;
   Form::disconnect_standard_dbh;
 
   $self->_watch_for_changed_files;
@@ -479,6 +499,54 @@ sub _check_for_old_config_files {
   ::end_of_request();
 }
 
+sub _parse_number_with_unit {
+  my ($number) = @_;
+
+  return undef   unless defined $number;
+  return $number unless $number =~ m{^ \s* (\d+) \s* ([kmg])b \s* $}xi;
+
+  my %factors = (K => 1024, M => 1024 * 1024, G => 1024 * 1024 * 1024);
+
+  return $1 * $factors{uc $2};
+}
+
+sub _memory_usage_is_too_high {
+  return undef unless $::lx_office_conf{system};
+
+  my %limits = (
+    rss  => _parse_number_with_unit($::lx_office_conf{system}->{memory_limit_rss}),
+    size => _parse_number_with_unit($::lx_office_conf{system}->{memory_limit_vsz}),
+  );
+
+  # $::lxdebug->dump(0, "limits", \%limits);
+
+  return undef unless $limits{rss} || $limits{vsz};
+
+  my %usage;
+
+  my $in = IO::File->new("/proc/$$/status", "r") or return undef;
+
+  while (<$in>) {
+    chomp;
+    $usage{lc $1} = _parse_number_with_unit($2) if m{^ vm(rss|size): \s* (\d+ \s* [kmg]b) \s* $}ix;
+  }
+
+  $in->close;
+
+  # $::lxdebug->dump(0, "usage", \%usage);
+
+  foreach my $type (keys %limits) {
+    next if !$limits{$type};
+    next if $limits{$type} >= ($usage{$type} // 0);
+
+    $::lxdebug->message(LXDebug::WARN(), "Exiting due to memory size limit reached for type '${type}': limit " . $limits{$type} . " bytes, usage " . $usage{$type} . " bytes");
+
+    return 1;
+  }
+
+  return 0;
+}
+
 package main;
 
 use strict;