From d71ef8a35787bce195db69e2e70e74032e6aa1d5 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 17 Apr 2018 13:30:43 +0200 Subject: show warning on stopped slave --- buildmaster/blacklist.php | 1 + buildmaster/build-list.php | 1 + buildmaster/build-slaves.php | 1 + buildmaster/index.html | 16 ---------------- buildmaster/index.php | 22 ++++++++++++++++++++++ buildmaster/mysql-issues.php | 27 ++++++++++++++------------- buildmaster/status.php | 17 +++++++++-------- buildmaster/to-delete.php | 2 ++ buildmaster/todos.php | 1 + lib/mysql.php | 2 +- packages/index.php | 1 + packages/pkginfo.php | 1 + 12 files changed, 54 insertions(+), 38 deletions(-) delete mode 100644 buildmaster/index.html create mode 100644 buildmaster/index.php diff --git a/buildmaster/blacklist.php b/buildmaster/blacklist.php index 274d769..fc49d42 100644 --- a/buildmaster/blacklist.php +++ b/buildmaster/blacklist.php @@ -18,6 +18,7 @@ + diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php index 966c5b5..b1aa94e 100644 --- a/buildmaster/build-list.php +++ b/buildmaster/build-list.php @@ -167,6 +167,7 @@ print "List of " . $to_show . " package builds\n"; print "\n"; print "\n"; print "\n"; +show_warning_on_offline_slave(); print "Start page\n"; print "build logs
\n"; diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php index 9a45afd..e3bf2a3 100644 --- a/buildmaster/build-slaves.php +++ b/buildmaster/build-slaves.php @@ -25,6 +25,7 @@ \n"; if ($result->num_rows > 0) { diff --git a/buildmaster/index.html b/buildmaster/index.html deleted file mode 100644 index 6ed3f6c..0000000 --- a/buildmaster/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - -Archlinux32 packages - - -build list -broken packages
-build-slaves -status
-broken dependencies in the database
-todos -as graph
-blacklisted packages
-
- - diff --git a/buildmaster/index.php b/buildmaster/index.php new file mode 100644 index 0000000..8c1ed9f --- /dev/null +++ b/buildmaster/index.php @@ -0,0 +1,22 @@ + + + + Archlinux32 packages + + + + build list + broken packages
+ build-slaves + status
+ broken dependencies in the database
+ todos + as graph
+ blacklisted packages
+
+ + diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php index 2b54c34..72e3558 100644 --- a/buildmaster/mysql-issues.php +++ b/buildmaster/mysql-issues.php @@ -95,21 +95,22 @@ ?> - -More and less critical issues with the database - - - -Start page
+ + More and less critical issues with the database + + + + + Start page
\n"; + print " Found " . count( $serious_issues ) . " serious issues.
\n"; foreach ( $serious_issues as $row ) { if ($row["is_to_be_deleted"]==1) - print "(marked as to-be-deleted) "; + print " (marked as to-be-deleted) "; else - print ""; + print " "; print $row["pkgfile"] . " depends on " . $row["install_target"] . " which is not provided by any package"; if (isset($row["subst_repository"])) print " - but can be replaced by the one in " . $row["subst_repository"]; @@ -119,17 +120,17 @@ print "\n"; } - print "Found " . count( $stability_issues ) . " stability issues.
\n"; + print " Found " . count( $stability_issues ) . " stability issues.
\n"; foreach ( $stability_issues as $row ) { if ($row["is_to_be_deleted"]==1) - print "(marked as to-be-deleted) "; + print " (marked as to-be-deleted) "; else - print ""; + print " "; print $row["pkgfile"] . " depends on " . $row["install_target"] . " which is not provided by any package installable from enabled " . $row["stability"] . " repositories.
"; print "\n"; } ?> - + diff --git a/buildmaster/status.php b/buildmaster/status.php index 28eee69..d58d379 100644 --- a/buildmaster/status.php +++ b/buildmaster/status.php @@ -9,19 +9,20 @@ ?> - -Build master status - - - -Start page
+ + Build master status + + + + + Start page
num_rows > 0) { $row = $result->fetch_assoc(); - print "latest package source is from " . $row["last"] . ".
\n"; + print " latest package source is from " . $row["last"] . ".
\n"; } ?> - + diff --git a/buildmaster/to-delete.php b/buildmaster/to-delete.php index 4da10a2..e4d8e67 100644 --- a/buildmaster/to-delete.php +++ b/buildmaster/to-delete.php @@ -27,6 +27,8 @@ num_rows > 0) { $count = 0; diff --git a/buildmaster/todos.php b/buildmaster/todos.php index ba870fc..2f8d15c 100644 --- a/buildmaster/todos.php +++ b/buildmaster/todos.php @@ -71,6 +71,7 @@ if (isset($_GET["graph"])) { print "Todos in the build scripts\n"; print "\n"; print "\n"; + show_warning_on_offline_slave(); while ($row = $result->fetch_assoc()) { print "TODO #" . $row["id"] . ""; diff --git a/lib/mysql.php b/lib/mysql.php index 94d35b8..d595d64 100644 --- a/lib/mysql.php +++ b/lib/mysql.php @@ -22,6 +22,6 @@ function show_warning_on_offline_slave() { $result = mysql_run_query("SHOW STATUS LIKE \"Slave_running\""); if (($result -> num_rows == 0) || ($result -> fetch_assoc() ["Value"] != "ON")) { - print "
The replication slave is currently not running. The database might be outdated.
"; + print "
The replication slave is currently not running. The database might be outdated.
\n"; } } diff --git a/packages/index.php b/packages/index.php index 3c0d0ba..7230239 100644 --- a/packages/index.php +++ b/packages/index.php @@ -262,6 +262,7 @@ +
diff --git a/packages/pkginfo.php b/packages/pkginfo.php index ef7ddeb..7d213a2 100644 --- a/packages/pkginfo.php +++ b/packages/pkginfo.php @@ -227,6 +227,7 @@ +
architecture