From 1f24a5d50eba30dcdbf26106f539c6c47eea439f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 17 Apr 2021 20:55:43 +0200
Subject: Show start error (#3590)

* Show start error
#fix https://github.com/FreshRSS/FreshRSS/issues/3581
We were not showing the actual error for several types of exceptions, e.g. database connection error.
Possible regression since https://github.com/FreshRSS/FreshRSS/pull/3407

* Try to make the error message less confusing
---
 lib/Minz/FrontController.php | 2 +-
 lib/lib_rss.php              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index b6831c2f3..d6ab756bf 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -96,7 +96,7 @@ class Minz_FrontController {
 					true
 				);
 			} else {
-				$this->killApp();
+				$this->killApp($e->getMessage());
 			}
 		}
 	}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 9521a62c4..0c6191690 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -557,11 +557,12 @@ function errorMessage($errorTitle, $error = '') {
 	return <<<MSG
 	<h1>{$errorTitle}</h1>
 	{$error}
-	<h2>Common problems</h2>
-	<p>A typical problem leading to this message is wrong file permissions in the <code>./FreshRSS/data/</code> folder
+	<h2>Check the logs</h2>
+	<p>FreshRSS logs are located in <code>./FreshRSS/data/users/*/log*.txt</code></p>
+	<p><em>N.B.:</em> A typical problem is wrong file permissions in the <code>./FreshRSS/data/</code> folder
 	so make sure the Web server can write there and in sub-directories.</p>
-	<h2>Common locations for additional logs</h2>
-	<p><strong>N.B.:</strong> Adapt names and paths according to your local setup.</p>
+	<h3>Common locations for additional logs</h3>
+	<p><em>N.B.:</em> Adapt names and paths according to your local setup.</p>
 	<ul>
 	<li>If using Docker: <code>docker logs -f freshrss</code></li>
 	<li>To check Web server logs on a Linux system using systemd: <code>journalctl -xeu apache2</code>
-- 
cgit v1.2.3