[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / lond

[raeburn]

raeburn		Mon May  4 17:08:27 2020 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	lond 
  Log:
  - For 2.11
    Backport 1.562
  
  
Index: loncom/lond
diff -u loncom/lond:1.489.2.36 loncom/lond:1.489.2.37
--- loncom/lond:1.489.2.36	Mon May  4 15:15:16 2020
+++ loncom/lond	Mon May  4 17:08:26 2020
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.36 2020/05/04 15:15:16 raeburn Exp $
+# $Id: lond,v 1.489.2.37 2020/05/04 17:08:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.36 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.37 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -4589,9 +4589,9 @@
             next if ($filename=~/^\./);
             next if ($filename=~/^publicuser_/);
             next if ($filename=~/^[a-f0-9]+_(linked|lti_\d+)\.id$/);
-            if ($filename =~ /^($LONCAPA::match_user)_\d+_($LONCAPA::match_domain)_/) {
+            if ($filename =~ /^($LONCAPA::match_username)_\d+_($LONCAPA::match_domain)_/) {
                 my ($uname,$udom) = ($1,$2);
-                next unless (-e "$perlvar{'lonDaemons'}/$uname$dbsuffix");
+                next unless (-e "$perlvar{'lonDaemons'}/tmp/$uname$dbsuffix");
                 my $mtime = (stat("$perlvar{'lonIDsDir'}/$filename"))[9];
                 my $since=$now-$mtime;
                 if ($lastactivity < 0) {