--- loncom/lonnet/perl/lonnet.pm 2007/04/04 00:05:31 1.861 +++ loncom/lonnet/perl/lonnet.pm 2007/04/04 00:07:07 1.862 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.861 2007/04/04 00:05:31 albertel Exp $ +# $Id: lonnet.pm,v 1.862 2007/04/04 00:07:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -7704,15 +7704,6 @@ sub goodbye { &logthis("Shutting down"); } -BEGIN { - -# ----------------------------------- Read loncapa.conf and loncapa_apache.conf - unless ($readit) { -{ - my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf'); - %perlvar = (%perlvar,%{$configvars}); -} - sub get_dns { my ($url,$func) = @_; open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); @@ -7807,9 +7798,6 @@ sub get_dns { $loaded=1; } - # FIXME: dev server don't want this, production servers _do_ want this - #&get_iphost(); - sub hostname { &load_hosts_tab() if (!$loaded); @@ -7925,6 +7913,16 @@ sub get_dns { } } +BEGIN { + +# ----------------------------------- Read loncapa.conf and loncapa_apache.conf + unless ($readit) { +{ + my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf'); + %perlvar = (%perlvar,%{$configvars}); +} + + # ------------------------------------------------------ Read spare server file { open(my $config,"<$perlvar{'lonTabDir'}/spare.tab");