show warning on stopped slave

author: Erich Eckner <git@eckner.net> 2018-04-17 13:30:43 +0200
committer: Erich Eckner <git@eckner.net> 2018-04-17 13:30:43 +0200
commit: d71ef8a35787bce195db69e2e70e74032e6aa1d5 (patch)
tree: bb4ee6a1441dd49ea1810f636f13be95796667c4
parent: 336ca22abf7f14444185fe8543d7188a248b5a06 (diff)
download: archweb32-d71ef8a35787bce195db69e2e70e74032e6aa1d5.tar.xz
12 files changed, 54 insertions, 38 deletions
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 @@
     <link rel="stylesheet" type="text/css" href="/static/style.css">
   </head>
   <body>
+<?php show_warning_on_offline_slave(); ?>
     <table>
       <tr>
         <th>architecture</th>
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 "<title>List of " . $to_show . " package builds</title>\n";
 print "<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/style.css\">\n";
 print "</head>\n";
 print "<body>\n";
+show_warning_on_offline_slave();
 print "<a href=\"https://buildmaster.archlinux32.org/\">Start page</a>\n";
 print "<a href=\"https://buildmaster.archlinux32.org/build-logs/\">build logs</a><br>\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 @@
   </head>
   <body>
 <?php
+show_warning_on_offline_slave();
 
   print "<table border=1>\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 @@
-<html>
-<head>
-<title>Archlinux32 packages</title>
-</head>
-<body>
-<a href="/buildmaster/build-list.php">build list</a>
-<a href="/buildmaster/build-list.php?show=broken">broken packages</a><br>
-<a href="/buildmaster/build-slaves.php">build-slaves</a>
-<a href="/buildmaster/status.php">status</a><br>
-<a href="/buildmaster/mysql-issues.php">broken dependencies in the database</a><br>
-<a href="/buildmaster/todos.php">todos</a>
-as <a href="/buildmaster/todos.php?graph">graph</a><br>
-<a href="/buildmaster/blacklist.php">blacklisted packages</a><br>
-<img src="/buildmaster/statistics.php?log"><br>
-</body>
-</html>
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 @@
+<?php
+
+  include "lib/mysql.php";
+
+?>
+<html>
+  <head>
+    <title>Archlinux32 packages</title>
+  </head>
+  <body>
+<?php show_warning_on_offline_slave(); ?>
+    <a href="/buildmaster/build-list.php">build list</a>
+    <a href="/buildmaster/build-list.php?show=broken">broken packages</a><br>
+    <a href="/buildmaster/build-slaves.php">build-slaves</a>
+    <a href="/buildmaster/status.php">status</a><br>
+    <a href="/buildmaster/mysql-issues.php">broken dependencies in the database</a><br>
+    <a href="/buildmaster/todos.php">todos</a>
+    as <a href="/buildmaster/todos.php?graph">graph</a><br>
+    <a href="/buildmaster/blacklist.php">blacklisted packages</a><br>
+    <img src="/buildmaster/statistics.php?log"><br>
+  </body>
+</html>
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 @@
 
 ?>
 <html>
-<head>
-<title>More and less critical issues with the database</title>
-<link rel="stylesheet" type="text/css" href="/static/style.css">
-</head>
-<body>
-<a href="https://buildmaster.archlinux32.org/">Start page</a><br>
+  <head>
+    <title>More and less critical issues with the database</title>
+    <link rel="stylesheet" type="text/css" href="/static/style.css">
+  </head>
+  <body>
+<?php show_warning_on_offline_slave(); ?>
+    <a href="https://buildmaster.archlinux32.org/">Start page</a><br>
 <?php
 
-  print "Found " . count( $serious_issues ) . " serious issues.<br>\n";
+  print "    Found " . count( $serious_issues ) . " serious issues.<br>\n";
 
   foreach ( $serious_issues as $row ) {
     if ($row["is_to_be_deleted"]==1)
-      print "<font color=\"#00ff00\">(marked as to-be-deleted) ";
+      print "    <font color=\"#00ff00\">(marked as to-be-deleted) ";
     else
-      print "<font color=\"#ff0000\">";
+      print "    <font color=\"#ff0000\">";
     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 "</font>\n";
   }
 
-  print "Found " . count( $stability_issues ) . " stability issues.<br>\n";
+  print "    Found " . count( $stability_issues ) . " stability issues.<br>\n";
 
   foreach ( $stability_issues as $row ) {
     if ($row["is_to_be_deleted"]==1)
-      print "<font color=\"#00ff00\">(marked as to-be-deleted) ";
+      print "    <font color=\"#00ff00\">(marked as to-be-deleted) ";
     else
-      print "<font color=\"#800000\">";
+      print "    <font color=\"#800000\">";
     print $row["pkgfile"] . " depends on " . $row["install_target"] . " which is not provided by any package installable from enabled " . $row["stability"] . " repositories.<br>";
     print "</font>\n";
   }
 
 ?>
-</body>
+  </body>
 </html>
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 @@
 
 ?>
 <html>
-<head>
-<title>Build master status</title>
-<link rel="stylesheet" type="text/css" href="/static/style.css">
-</head>
-<body>
-<a href="https://buildmaster.archlinux32.org/">Start page</a><br>
+  <head>
+    <title>Build master status</title>
+    <link rel="stylesheet" type="text/css" href="/static/style.css">
+  </head>
+  <body>
+<?php show_warning_on_offline_slave(); ?>
+    <a href="https://buildmaster.archlinux32.org/">Start page</a><br>
 <?php
 
 if ($result -> num_rows > 0) {
   $row = $result->fetch_assoc();
-  print "latest package source is from " . $row["last"] . ".<br>\n";
+  print "    latest package source is from " . $row["last"] . ".<br>\n";
 }
 
 ?>
-</body>
+  </body>
 </html>
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 @@
 <body>
 <?php
 
+show_warning_on_offline_slave();
+
 if ($result -> 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 "<title>Todos in the build scripts</title>\n";
     print "</head>\n";
     print "<body>\n";
+    show_warning_on_offline_slave();
 
     while ($row = $result->fetch_assoc()) {
       print "<a href=\"#TODO" . $row["id"] . "\">TODO #" . $row["id"] . "</a>";
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 "<div><font color=\"fff0000\">The replication slave is currently not running. The database might be outdated.</font></div>";
+    print "<div><font color=\"fff0000\">The replication slave is currently not running. The database might be outdated.</font></div>\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 @@
     <link rel="shortcut icon" type="image/x-icon" href="/static/favicon.ico" />
   </head>
   <body class="">
+<?php show_warning_on_offline_slave(); ?>
     <div id="archnavbar" class="anb-packages">
       <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux</a></h1></div>
       <div id="archnavbarmenu">
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 @@
     <link rel="shortcut icon" type="image/x-icon" href="/static/favicon.ico" />
   </head>
   <body class="">
+<?php show_warning_on_offline_slave(); ?>
     <div id="archnavbar" class="anb-packages">
       <div id="archnavbarlogo">
         <h1><a href="/" title="Return to the main page">Arch Linux</a></h1>
author	Erich Eckner <git@eckner.net>	2018-04-17 13:30:43 +0200
committer	Erich Eckner <git@eckner.net>	2018-04-17 13:30:43 +0200
commit	d71ef8a35787bce195db69e2e70e74032e6aa1d5 (patch)
tree	bb4ee6a1441dd49ea1810f636f13be95796667c4
parent	336ca22abf7f14444185fe8543d7188a248b5a06 (diff)
download	archweb32-d71ef8a35787bce195db69e2e70e74032e6aa1d5.tar.xz