X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;fp=update_daemon2.php;h=d5b6a45e36b0cf35fa088f875840382077d2544e;hb=e2cf81e21406f0b507446cf369f7da172ce9da14;hp=7692eb93030c0ec583cfb229ebdcda8fa35bb71f;hpb=654650857ffc3e4914c9655528e1037939f75f54;p=tt-rss.git diff --git a/update_daemon2.php b/update_daemon2.php index 7692eb93..d5b6a45e 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -170,14 +170,15 @@ "Maybe another daemon is already running.\n"); } - init_plugins(); - $schema_version = get_schema_version(); if ($schema_version != SCHEMA_VERSION) { die("Schema version is wrong, please upgrade the database.\n"); } + // Protip: children close shared database handle when terminating, it's a bad idea to + // do database stuff on main process from now on. + while (true) { // Since sleep is interupted by SIGCHLD, we need another way to @@ -190,17 +191,6 @@ } if ($last_checkpoint + $spawn_interval < time()) { - - /* Check if schema version changed */ - - $test_schema_version = get_schema_version(); - - if ($test_schema_version != $schema_version) { - echo "Expected schema version: $schema_version, got: $test_schema_version\n"; - echo "Schema version changed while we were running, bailing out\n"; - exit(100); - } - check_ctimes(); reap_children();