From 0946addf7e061fa710985d7b67e01adb3f2453aa Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 20 Jan 2012 17:47:24 +0100 Subject: [PATCH] MINOR Unified messages in URLCheck, removed "homepage" references --- code/DefaultHealthChecks.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/DefaultHealthChecks.php b/code/DefaultHealthChecks.php index 500d6bf..4aee636 100644 --- a/code/DefaultHealthChecks.php +++ b/code/DefaultHealthChecks.php @@ -51,13 +51,22 @@ class URLCheck implements EnvironmentCheck { $response = Director::test($this->url); if($response->getStatusCode() != 200) { - return array(EnvironmentCheck::ERROR, "Homepage requested and returned HTTP " . $response->getStatusCode() . " response"); + return array( + EnvironmentCheck::ERROR, + sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode()) + ); } else if($this->testString && (strpos($response->getBody(), $this->testString) === false)) { - return array(EnvironmentCheck::WARNING, "Homepage requested ok but '$testString' not found."); + return array( + EnvironmentCheck::WARNING, + sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $testString) + ); } else { - return array(EnvironmentCheck::OK, ""); + return array( + EnvironmentCheck::OK, + sprintf('Success retrieving "%s"', $this->url) + ); } } }