--- loncom/loncron	2005/05/26 20:25:00	1.59
+++ loncom/loncron	2005/11/10 19:07:01	1.62
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.59 2005/05/26 20:25:00 albertel Exp $
+# $Id: loncron,v 1.62 2005/11/10 19:07:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,14 +92,13 @@ sub start_daemon {
 	rename("$error_fname","$error_fname.1");
     }
     system("$perlvar{'lonDaemons'}/$progname 2>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
-    sleep 2;
+    sleep 1;
     if (-e $pidfile) {
 	&log($fh,"<p>Seems like it started ...</p>");
 	my $lfh=IO::File->new("$pidfile");
 	my $daemonpid=<$lfh>;
 	chomp($daemonpid);
-	sleep 2;
-	if (kill 0 => $daemonpid) {
+	if ($daemonpid =~ /^\d+$/ && kill 0 => $daemonpid) {
 	    return 1;
 	} else {
 	    return 0;
@@ -135,7 +134,7 @@ sub checkon_daemon {
 	my $lfh=IO::File->new("$pidfile");
 	$daemonpid=<$lfh>;
 	chomp($daemonpid);
-	if (kill 0 => $daemonpid) {
+	if ($daemonpid =~ /^\d+$/ && kill 0 => $daemonpid) {
 	    &log($fh,"<h3>$daemon at pid $daemonpid responding");
 	    if ($send) { &log($fh,", sending $send"); }
 	    &log($fh,"</h3>");
@@ -161,7 +160,7 @@ sub checkon_daemon {
 	if ($kadaemon eq 'lonmemcached') { $kadaemon='memcached'; }
 	&log($fh,'<br><font color="red">Killall '.$daemon.': '.
 	    `killall $kadaemon 2>&1`.' - ');
-	sleep 2;
+	sleep 1;
 	&log($fh,unlink($pidfile).' - '.
 	    `killall -9 $kadaemon 2>&1`.
 	    '</font><br>');
@@ -278,6 +277,16 @@ sub log_machine_info {
     if ($psproc>200) { $notices++; }
     if ($psproc>250) { $notices++; }
 
+    &log($fh,"<h3>distprobe</h3>");
+    &log($fh,"<pre>");
+    open(DSH,"$perlvar{'lonDaemons'}/distprobe |");
+    while (my $line=<DSH>) { 
+	&log($fh,&encode_entities($line,'<>&"')); 
+	$psproc++;
+    }
+    close(DSH);
+    &log($fh,"</pre>");
+
     &errout($fh);
 }