Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

web: fixes to server status page

This commit is contained in:
David Anderson 2015-03-12 12:21:13 -07:00
parent c10aaa971b
commit e44b96ca4b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
html/user/server_status.php
View File

@ -238,10 +238,14 @@ function show_status_xml($x) {
}
function local_daemon_running($cmd) {
$cmd = explode(" ", $cmd);
$prog = $cmd[0];
$out = exec("ps -C $prog");
if (strstr($out, $prog)) return 1;
$cmd = trim($cmd);
$x = explode(" ", $cmd);
$prog = $x[0];
$out = Array();
exec("ps -Fw -C $prog", $out);
foreach ($out as $y) {
if (strstr($y, $cmd)) return 1;
}
return 0;
}
@ -263,6 +267,10 @@ function get_daemon_status() {
$main_host = (string)$config->host;
$master_url = (string)$config->master_url;
$u = parse_url($master_url);
if (!array_key_exists("host", $u)) {
print_r($u);
die("can't parse URL $master_url");
}
$master_host = $u["host"];
if ($config->www_host) {
$web_host = (string) $config->www_host;