perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/lib/ModPerl TestRun.pm
Date Wed, 28 Jan 2004 19:26:41 GMT
stas        2004/01/28 11:26:41

  Modified:    lib/ModPerl TestRun.pm
  Log:
  can't call Apache::Build->build_config->mpm_is_threaded at compile time,
  since ModPerl::TestRun is loaded also during mp2 build, when build_config
  is not ready yet. postpone this call untill it's needed.
  
  Revision  Changes    Path
  1.17      +4 -6      modperl-2.0/lib/ModPerl/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -u -r1.16 -r1.17
  --- TestRun.pm	28 Jan 2004 06:02:50 -0000	1.16
  +++ TestRun.pm	28 Jan 2004 19:26:41 -0000	1.17
  @@ -12,15 +12,13 @@
   # become available
   use constant MIN_MAXCLIENTS => 2;
   
  -# default timeout in secs (threaded mpms are extremely slow to
  -# startup, due to a slow perl_clone operation)
  -use constant DEFAULT_STARTUP_TIMEOUT =>
  -    Apache::Build->build_config->mpm_is_threaded() ? 180 : 120;
  -
   sub new_test_config {
       my $self = shift;
   
  -    $self->{conf_opts}->{startup_timeout} ||= DEFAULT_STARTUP_TIMEOUT;
  +    # default timeout in secs (threaded mpms are extremely slow to
  +    # startup, due to a slow perl_clone operation)
  +    $self->{conf_opts}->{startup_timeout} ||=
  +        Apache::Build->build_config->mpm_is_threaded() ? 180 : 120;
   
       $self->{conf_opts}->{maxclients} ||= MIN_MAXCLIENTS;
   
  
  
  

Mime
View raw message