[LON-CAPA-cvs] cvs: loncom /build make_domain_coordinator.pl

[raeburn]

raeburn		Tue Nov 20 19:00:53 2012 EDT

  Modified files:              
    /loncom/build	make_domain_coordinator.pl 
  Log:
  - Fix path to nohist_rolelog.db when calling chown.
  - Check if domainconfig user exists.
  
  
Index: loncom/build/make_domain_coordinator.pl
diff -u loncom/build/make_domain_coordinator.pl:1.22 loncom/build/make_domain_coordinator.pl:1.23
--- loncom/build/make_domain_coordinator.pl:1.22	Fri Aug 17 22:43:03 2012
+++ loncom/build/make_domain_coordinator.pl	Tue Nov 20 19:00:52 2012
@@ -11,7 +11,7 @@
 # The LearningOnline Network
 # make_domain_coordinator.pl - Make a domain coordinator on a system
 #
-# $Id: make_domain_coordinator.pl,v 1.22 2012/08/17 22:43:03 raeburn Exp $
+# $Id: make_domain_coordinator.pl,v 1.23 2012/11/20 19:00:52 raeburn Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -481,30 +481,36 @@
 my $domconfiguser = $domain.'-domainconfig';
 my $subdir = $domconfiguser;
 $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+$subdir .= "/$domconfiguser";
 
-my $rolelogref = &LONCAPA::locking_hash_tie("$dompath/$subdir/$domconfiguser/nohist_rolelog.db",&GDBM_WRCREAT());
-my $domlogkey = &LONCAPA::escape($now.'00000'.$$.'000000'); 
-my $storehash = {
-                   role    => 'dc',
-                   start   => $now,
-                   end     => 0,
-                   context => 'server',
-                };
-my $domlogvalue = {
-                    'exe_uname' => '',
-                    'exe_udom'  => $domain,
-                    'exe_time'  => $now,
-                    'exe_ip'    => '127.0.0.1',
-                    'delflag'   => '',
-                    'logentry'  => $storehash,
-                    'uname'     => $username,
-                    'udom'      => $domain,
-                 };
-$rolelogref->{$domlogkey}=&freeze_escape($domlogvalue);
-&LONCAPA::locking_hash_untie($rolelogref);
+if (-d "$dompath/$subdir") {
+    my $rolelogref = &LONCAPA::locking_hash_tie("$dompath/$subdir/nohist_rolelog.db",&GDBM_WRCREAT());
+    my $domlogkey = &LONCAPA::escape($now.'00000'.$$.'000000'); 
+    my $storehash = {
+                       role    => 'dc',
+                       start   => $now,
+                       end     => 0,
+                       context => 'server',
+                    };
+    my $domlogvalue = {
+                        'exe_uname' => '',
+                        'exe_udom'  => $domain,
+                        'exe_time'  => $now,
+                        'exe_ip'    => '127.0.0.1',
+                        'delflag'   => '',
+                        'logentry'  => $storehash,
+                        'uname'     => $username,
+                        'udom'      => $domain,
+                     };
+    $rolelogref->{$domlogkey}=&freeze_escape($domlogvalue);
+    &LONCAPA::locking_hash_untie($rolelogref);
 
- system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db"); # Must be writeable by httpd process.
- system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db.lock");
+    system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db"); # Must be writeable by httpd process.
+    system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db.lock");
+} else {
+    print(&mt('Failed to log role creation as the path to the directory: "[_1]" does not exist.',"$dompath/$subdir/")."\n".
+          &mt('Please run UPDATE from the top level directory of the extracted LON-CAPA tarball, i.e., two levels up from this current directory (loncom/build).'));
+}
 
 #Update allusers MySQL table