Merge remote-tracking branch 'origin/master' into develop

ushahidi · Feb 6, 2018 · 708b522 · 708b522
2 parents a9016f2 + 989e855
commit 708b522
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/application/bootstrap.php b/application/bootstrap.php
@@ -123,7 +123,7 @@
  */
 if (getenv("RAVEN_URL"))
 {
-	$client = (new Raven_Client(getenv("RAVEN_URL")))->install();
+	$client = (new Raven_Client(getenv("RAVEN_URL"), ['exclude' => ['HTTP_Exception_404']]))->install();
 
 	Kohana::$log->attach(new Log_Raven($client));
 }

diff --git a/application/classes/Log/Raven.php b/application/classes/Log/Raven.php
@@ -51,6 +51,10 @@ public function write(array $messages)
         {
             if (isset($message['additional']['exception']))
             {
+                if ($message['additional']['exception'] instanceof HTTP_Exception) {
+                    continue;
+                }
+
                 // Write each message into the log file
                 // Format: time --- level: body
                 $this->raven->captureException($message['additional']['exception']);

diff --git a/application/classes/Ushahidi/Multisite.php b/application/classes/Ushahidi/Multisite.php
@@ -33,10 +33,16 @@ protected function parseHost($host)
 			}
 			// If we still don't have a host
 			if (! $host) {
-				// .. parse the current URL
-				$url = Url::createFromServer($_SERVER);
-				// .. and grab the host
-				$host = $url->getHost()->toUnicode();
+				try {
+					// .. parse the current URL
+					$url = Url::createFromServer($_SERVER);
+					// .. and grab the host
+					$host = $url->getHost()->toUnicode();
+				} catch (\RuntimeException $e) {
+					// Something went wrong parsing the host
+					// Finally fallback to just $_SERVER vars
+					$host = $_SERVER['HTTP_HOST'];
+				}
 			}
 
 			// If $domain is set and we're at a subdomain of $domain..

diff --git a/application/config/init.php b/application/config/init.php
@@ -28,7 +28,7 @@
 	'base_url'    => '/',
 	'index_file'  => FALSE,
 	'charset'     => 'utf-8',
-	'errors'      => false,
+	'errors'      => true,
 	'profile'     => FALSE,
 	'caching'     => FALSE,
-);
+);
diff --git a/plugins/data-provider-email/classes/DataProvider/Email.php b/plugins/data-provider-email/classes/DataProvider/Email.php
@@ -189,7 +189,7 @@ public function fetch($limit = FALSE)
 		{
 			$errors = imap_errors();
 			$errors = is_array($errors) ? implode(', ', $errors) : "";
-			Kohana::$log->add(Log::ERROR, $e->getMessage() . ". Errors: :errors",
+			Kohana::$log->add(Log::INFO, $e->getMessage() . ". Errors: :errors",
 				[':errors' => $errors]);
 		}