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

[harris41]

harris41		Sat May 11 17:17:39 2002 EDT

  Modified files:              
    /loncom	lonc 
  Log:
  using LONCAPA::Configuration::read_conf
  BUG 129
  
  
Index: loncom/lonc
diff -u loncom/lonc:1.39 loncom/lonc:1.40
--- loncom/lonc:1.39	Wed Apr 10 00:35:31 2002
+++ loncom/lonc	Sat May 11 17:17:39 2002
@@ -5,7 +5,7 @@
 # provides persistent TCP connections to the other servers in the network
 # through multiplexed domain sockets
 #
-# $Id: lonc,v 1.39 2002/04/10 04:35:31 foxr Exp $
+# $Id: lonc,v 1.40 2002/05/11 21:17:39 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,10 @@
 # 3/07/02 Ron Fox 
 # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking
+# 5/11/2002 Scott Harrison
+
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
 
 use POSIX;
 use IO::Socket;
@@ -71,18 +75,11 @@
 $SIG{QUIT}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;
 
-# ------------------------------------ Read httpd access.conf and get variables
-&status("Read access.conf");
-open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
-
-while ($configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
-	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-        chomp($varvalue);
-        $perlvar{$varname}=$varvalue;
-    }
-}
-close(CONFIG);
+# ------------------------------------------- Read access.conf and loncapa.conf
+&status("Read access.conf and loncapa.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+my %perlvar=%{$perlvarref};
+undef $perlvarref;
 
 # ----------------------------- Make sure this process is running from user=www
 &status("Check user ID");