keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

poller.php is cleaned up, unneeded stuff has been removed

Browse source
This commit is contained in:
Michael 2017-11-18 11:01:01 +00:00
parent 925d2d2383
commit 01362461cf
3 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boot.php
View file

@ -39,7 +39,6 @@ require_once 'include/features.php';
require_once 'include/identity.php'; require_once 'include/identity.php';
require_once 'update.php'; require_once 'update.php';
require_once 'include/dbstructure.php'; require_once 'include/dbstructure.php';
require_once 'include/poller.php';
define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus'); define('FRIENDICA_CODENAME', 'Asparagus');

53
include/poller.php
View file

@ -3,6 +3,7 @@ use Friendica\App;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Core\Config; use Friendica\Core\Config;
// Ensure that poller.php is executed from the base path of the installation
if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
$directory = dirname($_SERVER["argv"][0]); $directory = dirname($_SERVER["argv"][0]);
@ -14,45 +15,35 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory); chdir($directory);
} }
require_once("boot.php"); require_once "boot.php";
require_once "include/dba.php";
function poller_run($argv, $argc) { $a = new App(dirname(__DIR__));
global $a;
if (empty($a)) { require_once ".htconfig.php";
$a = new App(dirname(__DIR__)); dba::connect($db_host, $db_user, $db_pass, $db_data);
} unset($db_host, $db_user, $db_pass, $db_data);
require_once ".htconfig.php"; Config::load();
require_once "include/dba.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
Config::load(); // Check the database structure and possibly fixes it
check_db(true);
// Check the database structure and possibly fixes it // Quit when in maintenance
check_db(true); if (Config::get('system', 'maintenance', true)) {
// Quit when in maintenance
if (Config::get('system', 'maintenance', true)) {
return;
}
$a->set_baseurl(Config::get('system', 'url'));
load_hooks();
$run_cron = (($argc <= 1) || ($argv[1] != "no_cron"));
Worker::processQueue($run_cron);
return; return;
} }
if (array_search(__file__, get_included_files()) === 0) { $a->set_baseurl(Config::get('system', 'url'));
poller_run($_SERVER["argv"], $_SERVER["argc"]);
Worker::unclaimProcess(); load_hooks();
get_app()->end_process(); $run_cron = (($_SERVER["argc"] <= 1) || ($_SERVER["argv"][1] != "no_cron"));
Worker::processQueue($run_cron);
Worker::unclaimProcess();
$a->end_process();
killme();
killme();
}

1
mod/worker.php
View file

@ -3,7 +3,6 @@
* @file mod/worker.php * @file mod/worker.php
* @brief Module for running the poller as frontend process * @brief Module for running the poller as frontend process
*/ */
require_once("include/poller.php");
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Core\Config; use Friendica\Core\Config;