|
|
@@ -508,7 +508,7 @@ function invalidateHttpCache($username = '') {
|
|
|
Minz_Session::_param('touch', uTimeString());
|
|
|
$username = Minz_Session::param('currentUser', '_');
|
|
|
}
|
|
|
- $ok = @touch(DATA_PATH . '/users/' . $username . '/log.txt');
|
|
|
+ $ok = @touch(DATA_PATH . '/users/' . $username . '/' . LOG_FILENAME);
|
|
|
//if (!$ok) {
|
|
|
//TODO: Display notification error on front-end
|
|
|
//}
|
|
|
@@ -569,9 +569,9 @@ function get_user_configuration($username) {
|
|
|
FRESHRSS_PATH . '/config-user.default.php');
|
|
|
} catch (Minz_ConfigurationNamespaceException $e) {
|
|
|
// namespace already exists, do nothing.
|
|
|
- Minz_Log::warning($e->getMessage(), USERS_PATH . '/_/log.txt');
|
|
|
+ Minz_Log::warning($e->getMessage(), ADMIN_LOG);
|
|
|
} catch (Minz_FileNotExistException $e) {
|
|
|
- Minz_Log::warning($e->getMessage(), USERS_PATH . '/_/log.txt');
|
|
|
+ Minz_Log::warning($e->getMessage(), ADMIN_LOG);
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
@@ -823,25 +823,16 @@ function errorMessageInfo($errorTitle, $error = '') {
|
|
|
$details = "<pre>{$details}</pre>";
|
|
|
}
|
|
|
|
|
|
+ header("Content-Security-Policy: default-src 'self'");
|
|
|
+
|
|
|
return <<<MSG
|
|
|
- <h1>{$errorTitle}</h1>
|
|
|
+ <!DOCTYPE html><html><header><title>HTTP 500: {$errorTitle}</title></header><body>
|
|
|
+ <h1>HTTP 500: {$errorTitle}</h1>
|
|
|
{$message}
|
|
|
{$details}
|
|
|
- <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>
|
|
|
- <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>
|
|
|
- and if you are using php-fpm: <code>journalctl -xeu php-fpm</code></li>
|
|
|
- <li>Otherwise, Web server logs are typically located in <code>/var/log/apache2/</code> or similar</li>
|
|
|
- <li>System logs may also contain relevant information in <code>/var/log/syslog</code>, or if using systemd: <code>sudo journalctl -xe</code></li>
|
|
|
- </ul>
|
|
|
- <p>More logs can be generated by enabling <code>'environment' => 'development',</code> in <code>./FreshRSS/data/config.php</code></p>
|
|
|
- <p>Running the feed update script (with the same user and PHP version as your Web server) might provide other hints, e.g.:
|
|
|
- <code>sudo -u www-data /usr/bin/php ./FreshRSS/app/actualize_script.php</code></p>
|
|
|
+ <hr />
|
|
|
+ <small>For help see the documentation: <a href="https://freshrss.github.io/FreshRSS/en/admins/logs_and_errors.html" target="_blank">
|
|
|
+ https://freshrss.github.io/FreshRSS/en/admins/logs_and_errors.html</a></small>
|
|
|
+ </body></html>
|
|
|
MSG;
|
|
|
}
|