From e2cf81e21406f0b507446cf369f7da172ce9da14 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Apr 2013 14:54:59 +0400 Subject: unify houskeeping stuff, increase spawn interval --- update_daemon2.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'update_daemon2.php') diff --git a/update_daemon2.php b/update_daemon2.php index 7692eb930..d5b6a45e3 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(); -- cgit v1.2.3