update_daemon2: check for dead children before spawning

[tt-rss.git] / sanity_check.php

diff --git a/sanity_check.php b/sanity_check.php
index 7d41ea73aee2307a9d13c87fe661daa0ff19dc33..2dfa75a83668407a55010f71319207c5976fd36b 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,8 +1,8 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 8);
-       define('SCHEMA_VERSION', 20);
+       define('EXPECTED_CONFIG_VERSION', 14);
+       define('SCHEMA_VERSION', 30);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 
@@ -66,6 +66,19 @@
                $err_msg = __("config: DATABASE_BACKED_SESSIONS are currently broken with MySQL");
        }
 
+       if (defined('MAIL_FROM')) {
+               $err_msg = __("config: MAIL_FROM has been split into DIGEST_FROM_NAME and DIGEST_FROM_ADDRESS");
+       }
+
+       if (!defined('COUNTERS_MAX_AGE')) {
+               $err_msg = __("config: option COUNTERS_MAX_AGE expected, but not defined");
+       }
+
+       if (defined('DAEMON_REFRESH_ONLY')) {
+               $err_msg = __("config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option and read about other ways to update feeds on the <a href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>.");
+
+       }
+
        if ($err_msg) {
                print "<b>".__("Fatal Error")."</b>: $err_msg\n";
                exit;