web: Add column daemon_flags

mariux64 · Apr 19, 2020 · 278ee8a · 278ee8a
1 parent de092e0
commit 278ee8a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in
@@ -776,7 +776,7 @@ sub server() {
 		daemon_memory_limit_slot_soft daemon_memory_limit_slot_hard
 		daemon_jobs_running daemon_slots_running
 		daemon_threads_running daemon_memory_used
-		mtime daemon_start daemon_stop
+		mtime daemon_start daemon_stop daemon_flags
 	);
 
 	my $sth=$dbh->prepare('SELECT '.join(',',@cols).' FROM mxq_daemon WHERE status<=200 ORDER BY hostname,daemon_name');
@@ -807,6 +807,7 @@ sub server() {
 #		'mtime',
 #		'start',
 #		'stop',
+		'F'
 	]));
 
 	my %S;
@@ -817,7 +818,7 @@ sub server() {
 			$daemon_memory_limit_slot_soft,$daemon_memory_limit_slot_hard,
 			$daemon_jobs_running,$daemon_slots_running,
 			$daemon_threads_running,$daemon_memory_used,
-			$mtime,$daemon_start,$daemon_stop
+			$mtime,$daemon_start,$daemon_stop,$daemon_flags
 		) = @$row;
 
 		$hostname =~s/\.molgen\.mpg\.de$//;
@@ -851,18 +852,19 @@ sub server() {
 #			$q->td($mtime),
 #			$q->td($daemon_start),
 #			$q->td($daemon_stop),
+			$q->td($daemon_flags ? 'X' : '&nbsp;' ),
 		);
 	}
 	map {
-		$out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),);
+		$out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'));
 	} keys %{$dead_hosts};
 
-	$out.=$q->Tr($q->td({colspan=>14},'&nbsp;'));
+	$out.=$q->Tr($q->td({colspan=>15},'&nbsp;'));
 	my $dist = join(', ',map {"$S{daemon_slots_dist}->{$_}x$_"} sort {$b <=> $a} keys %{$S{daemon_slots_dist}});
 	$out.=$q->Tr(
 		$q->td({class=>'center', colspan=>3},$S{servers}.' servers'),$q->td($dist),
 		$q->td({class=>'center', colspan=>3},$S{daemon_slots}.' cores'),$q->td({class=>'number'},size($S{daemon_memory_sum}*1000**2)),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),
-		$q->td({class=>'number'},$S{daemon_slots_running}),$q->td('&nbsp;'),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),);
+		$q->td({class=>'number'},$S{daemon_slots_running}),$q->td('&nbsp;'),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),$q->td('&nbsp;'));
 
 	$out.='</table>';
 	return $out;