Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353388 )
Change subject: return HTTP 503 if database connection fails
......................................................................
return HTTP 503 if database connection fails
To prevent error pages from being cached in varnish.
Bug: T163143
Change-Id: I8413ce66e852f7bc53fcb684963ebd64640eda61
---
M index.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, but someone else must approve
Jcrespo: Looks good to me, but someone else must approve
Dzahn: Verified; Looks good to me, approved
diff --git a/index.php b/index.php
index 206ed7f..66a470c 100644
--- a/index.php
+++ b/index.php
@@ -14,6 +14,13 @@
}
);
+# return http 503 if database connection fails to prevent
+# error pages from being cached in varnish (T163143)
+function db_fail($db_name, $db_host) {
+ header($_SERVER['SERVER_PROTOCOL'] . ' Service Unavailable' . , true, 503);
+ die('database connection to ' . $db_name . ' on ' . $db_host . 'failed');
+}
+
function db()
{
static $db = null;
@@ -22,7 +29,7 @@
{
e("db connect: host");
$db = @mysql_connect($db_host, $db_user, $db_pass)
- or die('database connection to ' . $db_name . ' on ' . $db_host .
'failed');
+ or db_fail($db_name, $db_host);
mysql_select_db($db_name);
}
return $db;
@@ -33,4 +40,4 @@
$tree = new Tree();
list ($clusters) = $tree->generate();
-include 'inc/template.php';
\ No newline at end of file
+include 'inc/template.php';
--
To view, visit https://gerrit.wikimedia.org/r/353388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8413ce66e852f7bc53fcb684963ebd64640eda61
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/dbtree
Gerrit-Branch: master
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
