[LON-CAPA-cvs] cvs: loncom / lonManage

[foxr]

foxr		Tue Oct 28 06:28:36 2003 EDT

  Modified files:              
    /loncom	lonManage 
  Log:
  - use lib . in order to access LondConnection.pm in the cwd.
    At this point we're requiring that lonMangae and LondConnection.pm
    be in the cwd of the user invocing lonManage.
  - Read the configuration files using the configuration I/O functions
    in LondConnection.pm for now... later we need switches that tell
    us:
    - Our lonCAPA hostname.
    - Where our 'hosts.tab' is.
    so that we can use the LondConnection::ReadForeignConfig member.
  
  
Index: loncom/lonManage
diff -u loncom/lonManage:1.16 loncom/lonManage:1.17
--- loncom/lonManage:1.16	Tue Oct 21 05:44:04 2003
+++ loncom/lonManage	Tue Oct 28 06:28:35 2003
@@ -3,9 +3,9 @@
 #
 #  lonManage supports remote management of nodes in a LonCAPA cluster.
 #
-#  $Id: lonManage,v 1.16 2003/10/21 09:44:04 foxr Exp $
+#  $Id: lonManage,v 1.17 2003/10/28 11:28:35 foxr Exp $
 #
-# $Id: lonManage,v 1.16 2003/10/21 09:44:04 foxr Exp $
+# $Id: lonManage,v 1.17 2003/10/28 11:28:35 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,75 +52,19 @@
 #   If [host] is not supplied, every host in the client's hosts.tab
 #   table is iterated through and procesed..
 #
-#  $Log: lonManage,v $
-#  Revision 1.16  2003/10/21 09:44:04  foxr
-#  Add ability to manage entire cluster in hosts table.
-#
-#  Revision 1.15  2003/09/16 09:49:54  foxr
-#  Adjust the usage message to reflect what actually will happen on
-#  --reinit={lond|lonc}
-#
-#  Revision 1.14  2003/09/08 09:45:20  foxr
-#  Remove BUGBUG about comment about authentication as we'll be doing
-#  host based authentication initially (no need for lonManage to do anything),
-#  and certificate based later (need at that time).
-#
-#  Revision 1.13  2003/08/19 10:26:24  foxr
-#  Initial working version... tested against an unmodified lond this
-#  produces an unknown_cmd response which is about what I'd expect.
-#
-#  Revision 1.12  2003/08/18 11:08:07  foxr
-#  Debug request building in Transact.
-#
-#  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
-#  a separate getconfig function and hoisting the config reads into that.
-#
-#  Revision 1.9  2003/08/18 10:25:46  foxr
-#  Write ReinitProcess function in terms of ValidHost and Transact.
-#
-#  Revision 1.8  2003/08/18 10:18:21  foxr
-#  Completed PushFile function in terms of
-#  - ValidHost - Determines if target host is valid.
-#  - Transact  - Performs one of the valid transactions with the
-#                appropriate lonc<-->lond client/server pairs.
-#
-#  Revision 1.7  2003/08/18 09:56:01  foxr
-#  1. Require to be run as root.
-#  2. Catch case where no operation switch is supplied and put out usage.
-#  3. skeleton/comments for PushFile function.
-#
-#  Revision 1.6  2003/08/12 11:02:59  foxr
-#  Implement command switch dispatching.
-#
-#  Revision 1.5  2003/08/12 10:55:42  foxr
-#  Complete command line parsing (tested)
-#
-#  Revision 1.4  2003/08/12 10:40:44  foxr
-#  Get switch parsing right.
-#
-#  Revision 1.3  2003/08/12 10:22:35  foxr
-#  Put in parameter parsing infrastructure
-#
-#  Revision 1.2  2003/08/12 09:58:49  foxr
-#  Add usage and skeleton documentation.
-#
 #
 
 
 
 # Modules required:
 
+use lib ".";
+
 use strict;			# Because it's good practice.
 use English;			# Cause I like meaningful names.
 use Getopt::Long;
-use LONCAPA::Configuration;	# To handle configuration I/O.
 use IO::Socket::UNIX;		# To communicate with lonc.
+use LondConnection;
 
 # File scoped variables:
 
@@ -267,9 +211,9 @@
 #  Read the loncapa configuration stuff.
 #
 sub ReadConfig {
-    my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
+    my $perlvarref = LondConnection::read_conf('loncapa.conf');
     %perlvar       = %{$perlvarref};
-    my $hoststab   = LONCAPA::Configuration::read_hosts(
+    my $hoststab   = LondConnection::read_hosts(
 					"$perlvar{'lonTabDir'}/hosts.tab");
     %hostshash     = %{$hoststab};