dougm 01/04/12 17:28:47 Modified: Apache-Test/lib/Apache TestConfigParse.pm TestServer.pm Log: include mpm name with server version report Revision Changes Path 1.2 +4 -0 modperl-2.0/Apache-Test/lib/Apache/TestConfigParse.pm Index: TestConfigParse.pm =================================================================== RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestConfigParse.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestConfigParse.pm 2001/04/02 08:57:07 1.1 +++ TestConfigParse.pm 2001/04/13 00:28:46 1.2 @@ -200,6 +200,10 @@ } close $proc; + + if (my $mpm_dir = $self->{httpd_defines}->{APACHE_MPM_DIR}) { + $self->{mpm} = basename $mpm_dir; + } } sub httpd_version { 1.5 +6 -2 modperl-2.0/Apache-Test/lib/Apache/TestServer.pm Index: TestServer.pm =================================================================== RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestServer.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestServer.pm 2001/04/10 16:48:49 1.4 +++ TestServer.pm 2001/04/13 00:28:46 1.5 @@ -247,6 +247,11 @@ sleep 1; } + my $version = $self->{version}; + my $mpm = $self->{config}->{mpm} || ""; + $mpm = "($mpm MPM)" if $mpm; + print "using $version $mpm\n"; + my $tries = 6; for (1..$tries) { @@ -273,8 +278,7 @@ } if (my $pid = $self->pid) { - my $version = $self->{version}; - print "server $self->{name} started (pid=$pid, version=$version)\n"; + print "server $self->{name} started (pid=$pid)\n"; while (my($module, $cfg) = each %{ $self->{config}->{vhosts} }) { print "server $cfg->{name} listening ($module)\n", }