[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /interface lonprintout.pm doc/loncapafiles loncapafiles.lpml

[www]

www		Mon Sep 16 16:38:46 2002 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
    /loncom	loncapa_apache.conf 
    /loncom/interface	lonprintout.pm 
  Log:
  More overload protection, and file to explain what is happening.
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.173 doc/loncapafiles/loncapafiles.lpml:1.174
--- doc/loncapafiles/loncapafiles.lpml:1.173	Tue Sep 10 15:01:09 2002
+++ doc/loncapafiles/loncapafiles.lpml	Mon Sep 16 16:38:46 2002
@@ -3,7 +3,7 @@
 <!-- loncapafiles.lpml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: loncapafiles.lpml,v 1.173 2002/09/10 19:01:09 www Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.174 2002/09/16 20:38:46 www Exp $ -->
 
 <!--
 
@@ -1260,6 +1260,14 @@
 <categoryname>interface file</categoryname>
 <description>
 Interface file for responding to improper page flipping.
+</description>
+</file>
+<file>
+<source>loncom/html/adm/overloaded.txt</source>
+<target dist='default'>home/httpd/html/adm/overloaded.txt</target>
+<categoryname>interface file</categoryname>
+<description>
+Interface file for responding to overload situations.
 </description>
 </file>
 <file>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.19 loncom/loncapa_apache.conf:1.20
--- loncom/loncapa_apache.conf:1.19	Tue Sep 10 15:01:09 2002
+++ loncom/loncapa_apache.conf	Mon Sep 16 16:38:46 2002
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.19 2002/09/10 19:01:09 www Exp $
+## $Id: loncapa_apache.conf,v 1.20 2002/09/16 20:38:46 www Exp $
 ##
 ## 1/11/2002 - Scott Harrison
 ## 2/19/2002 - Scott Harrison
@@ -196,6 +196,7 @@
 SetHandler perl-script
 PerlHandler Apache::lonstatistics
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -386,6 +387,7 @@
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -395,6 +397,7 @@
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -404,6 +407,7 @@
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -421,6 +425,7 @@
 SetHandler perl-script
 PerlHandler Apache::lonprintout
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -459,6 +464,7 @@
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchatfetch
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -500,6 +506,7 @@
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
 ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.66 loncom/interface/lonprintout.pm:1.67
--- loncom/interface/lonprintout.pm:1.66	Mon Sep 16 12:36:56 2002
+++ loncom/interface/lonprintout.pm	Mon Sep 16 16:38:46 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.66 2002/09/16 16:36:56 albertel Exp $
+# $Id: lonprintout.pm,v 1.67 2002/09/16 20:38:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -953,6 +953,14 @@
 sub handler {
 
     my $r = shift;
+
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+    $loaderror=
+       &Apache::lonnet::overloaderror($r,
+         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($loaderror) { return $loaderror; }
+
     $r->content_type('text/html');
     $r->send_http_header;
     $r->print(&Apache::loncommon::bodytag("Printing"));