From 4a411afe3b5e6c742b7a6dc3e8a7e45d5d075091 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 20 Jul 2018 09:55:44 +0200 Subject: buildmaster/build-slaves.php: change layout --- buildmaster/build-slaves.php | 230 +++++++++++++++++++++++++++++++++---------- 1 file changed, 176 insertions(+), 54 deletions(-) (limited to 'buildmaster') diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php index 978e99c..c5a3ddc 100644 --- a/buildmaster/build-slaves.php +++ b/buildmaster/build-slaves.php @@ -1,65 +1,187 @@ array( + "label" => "name", + "mysql_name" => "name", + "mysql_query" => "`build_slaves`.`name`", + "sort" => "name", + "title" => "name" + ), + "operator" => array( + "label" => "operator", + "mysql_name" => "operator", + "mysql_query" => "`persons`.`name`", + "sort" => "operator", + "title" => "operator" + ), + "currently_building" => array( + "label" => "currently building", + "mysql_name" => "cb", + "mysql_query" => "`package_sources`.`pkgbase`", + "sort" => "currently_building", + "title" => "pkgbase of currently building package" + ), + "last_connection" => array( + "label" => "last connection", + "mysql_name" => "lc", + "mysql_query" => "MAX(`ssh_log`.`date`)", + "sort" => "last_connection", + "title" => "time of last connection" + ), + "building_since" => array( + "label" => "building since", + "mysql_name" => "bs", + "mysql_query" => "MAX(IF(`ssh_log`.`action`=\"get-assignment\",`ssh_log`.`date`,NULL))", + "sort" => "building_since", + "title" => "start of build" + ), + "trials" => array( + "label" => "trials", + "mysql_name" => "trials", + "mysql_query" => "`build_slaves`.`trials`", + "sort" => "trials", + "title" => "number of trials" + ), + "logged_lines" => array( + "label" => "logged lines", + "mysql_name" => "ll", + "mysql_query" => "`build_slaves`.`logged_lines`", + "sort" => "logged_lines", + "title" => "number of logged lines so far" + ), + "last_action" => array( + "label" => "last action", + "mysql_name" => "la", + "mysql_query" => "`build_slaves`.`last_action`", + "sort" => "last_action", + "title" => "last action" + ) +); + +if (!isset($_GET["sort"])) + $_GET["sort"]="-last_connection"; + +if (substr($_GET["sort"],0,1) == "-") { + $direction = " DESC"; + $sort = substr($_GET["sort"],1); +} else { + $direction = " ASC"; + $sort = $_GET["sort"]; +} + +if (isset($columns[$sort])) + $order = "IFNULL(`sub_query`.`" . $columns[$sort]["mysql_name"] . "`,0) " . $direction . ","; +else + $order = ""; + +function combine_fields($cln) { + return $cln["mysql_query"] . " AS `" . $cln["mysql_name"] . "`"; +} + +$result = mysql_run_query( + "SELECT `sub_query`.* FROM (" . + "SELECT " . + implode(",",array_map("combine_fields",$columns)) . + " FROM `build_assignments`" . + " JOIN `package_sources`" . + " ON `build_assignments`.`package_source`=`package_sources`.`id`" . + + " RIGHT JOIN `build_slaves`" . + " ON `build_slaves`.`currently_building`=`build_assignments`.`id`" . + " JOIN `ssh_keys`" . + " ON `build_slaves`.`ssh_key`=`ssh_keys`.`id`" . + " JOIN `persons`" . + " ON `ssh_keys`.`owner`=`persons`.`id`" . + + " LEFT JOIN `ssh_log`" . + " ON `ssh_log`.`build_slave`=`build_slaves`.`id`" . " GROUP BY `build_slaves`.`id`" . - " ORDER BY `lc`" - ); + ") AS `sub_query`" . + " ORDER BY " . $order . "`sub_query`.`name`" +); + +$count = 0; + +while($row = $result->fetch_assoc()) { + + foreach ($row as $name => $value) { + if (!isset($row[$name])) + $rows[$count][$name] = " "; + else + $rows[$count][$name] = $value; + } + $rows[$count]["name"] = + "" . + $row["name"] . + ""; + + $count++; +} + +print_header("List of Build Slaves"); + +if ($count > 0) { + +?> +
+ + + +\n"; + print " \n"; + print " " . $column["label"] . "\n"; + print " \n"; + print " \n"; + +} ?> - - - list of build slaves - - + + + \n"; - if ($result->num_rows > 0) { - print "\n"; - while ($row = $result -> fetch_assoc()) { - foreach ($row as $key => $value) { - if ($value=="") { - $row[$key]=" "; - } - } - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print "\n"; - } + +$oddity = "odd"; + +foreach($rows as $row) { + + print " \n"; + + foreach ($columns as $column) { + + print " \n"; + } - print "
nameoperatorcurrently buildinglast connectionbuilding sincetrialslogged lineslast action
".$row["name"]."".$row["operator"]."".$row["pkgbase"]."".$row["lc"]."".$row["bs"]."".$row["trials"]."".$row["logged_lines"]."".$row["last_action"]."
\n"; + print " " . $row[$column["mysql_name"]] . "\n"; + print "
\n"; + print " \n"; + + if ($oddity == "odd" ) + $oddity = "even"; + else + $oddity = "odd"; + +} ?> - + + +
+