Browse Source

The direct structure call is now only executed when called via the poller.php

pull/3749/head
Michael 3 years ago
parent
commit
2971501f63
4 changed files with 8 additions and 6 deletions
  1. +2
    -2
      boot.php
  2. +4
    -1
      include/poller.php
  3. +1
    -1
      index.php
  4. +1
    -2
      util/db_update.php

+ 2
- 2
boot.php View File

@ -591,7 +591,7 @@ function is_ajax() {
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
function check_db() {
function check_db($via_worker) {
$build = get_config('system', 'build');
if (!x($build)) {
@ -600,7 +600,7 @@ function check_db() {
}
if ($build != DB_UPDATE_VERSION) {
// When we cannot execute the database update via the worker, we will do it directly
if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php')) {
if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php') && $via_worker) {
update_db(get_app());
}
}


+ 4
- 1
include/poller.php View File

@ -889,7 +889,10 @@ function poller_run_cron() {
poller_kill_stale_workers();
}
if (array_search(__file__,get_included_files())===0){
if (array_search(__file__,get_included_files())===0) {
// Check the database structure and possibly fixes it
check_db(true);
poller_run($_SERVER["argv"],$_SERVER["argc"]);
poller_unclaim_process();


+ 1
- 1
index.php View File

@ -196,7 +196,7 @@ if ($install && $a->module!="view") {
$a->module = 'maintenance';
} else {
check_url($a);
check_db();
check_db(false);
check_plugins($a);
}


+ 1
- 2
util/db_update.php View File

@ -29,7 +29,6 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
if ($build != DB_UPDATE_VERSION) {
echo "Updating database...";
check_db($a);
update_db($a);
echo "Done\n";
}

Loading…
Cancel
Save