--- loncom/Attic/lonManage 2003/08/18 10:43:31 1.10 +++ loncom/Attic/lonManage 2003/08/18 10:45:32 1.11 @@ -3,9 +3,9 @@ # # lonManage supports remote management of nodes in a LonCAPA cluster. # -# $Id: lonManage,v 1.10 2003/08/18 10:43:31 foxr Exp $ +# $Id: lonManage,v 1.11 2003/08/18 10:45:32 foxr Exp $ # -# $Id: lonManage,v 1.10 2003/08/18 10:43:31 foxr Exp $ +# $Id: lonManage,v 1.11 2003/08/18 10:45:32 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,6 +50,10 @@ # not the IP address of the host. # # $Log: lonManage,v $ +# Revision 1.11 2003/08/18 10:45:32 foxr +# Felt strongly enough about hoisting ReadConfiguration into a separate sub +# that I did it now before I forgot. +# # Revision 1.10 2003/08/18 10:43:31 foxr # Code/test ValidHost. The hosts.tab and the perl variables are read in as # global hashes as a side effect. May later want to clean this up by making @@ -202,6 +206,17 @@ sub ParseArgs { return @result; } # +# Read the loncapa configuration stuff. +# +sub ReadConfig { + my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf'); + %perlvar = %{$perlvarref}; + my $hoststab = LONCAPA::Configuration::read_hosts( + "$perlvar{'lonTabDir'}/hosts.tab"); + %hostshash = %{$hoststab}; + +} +# # Determine if the target host is valid. # This is done by reading the current hosts.tab file. # For the host to be valid, it must be inthe file. @@ -214,12 +229,8 @@ sub ParseArgs { # sub ValidHost { my $host = shift; - - my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf'); - %perlvar = %{$perlvarref}; - my $hoststab = LONCAPA::Configuration::read_hosts( - "$perlvar{'lonTabDir'}/hosts.tab"); - %hostshash = %{$hoststab}; + + ReadConfig; return defined $hostshash{$host};