strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Michael 2017-09-30 17:12:27 +00:00
parent d691c2e621
commit 2971501f63
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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'); 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'); $build = get_config('system', 'build');
if (!x($build)) { if (!x($build)) {
@ -600,7 +600,7 @@ function check_db() {
} }
if ($build != DB_UPDATE_VERSION) { if ($build != DB_UPDATE_VERSION) {
// When we cannot execute the database update via the worker, we will do it directly // 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()); update_db(get_app());
} }
} }

5
include/poller.php
View file

@ -889,7 +889,10 @@ function poller_run_cron() {
poller_kill_stale_workers(); 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_run($_SERVER["argv"],$_SERVER["argc"]);
poller_unclaim_process(); poller_unclaim_process();

2
index.php
View file

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

3
util/db_update.php
View file

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