clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Browse Source
This commit is contained in:
Michael
2017-03-18 08:31:43 +00:00
parent 1624150db4 909e1e055f
commit e301fa0832
64 changed files with 1826 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/poller.php
View File

@@ -35,6 +35,10 @@ function poller_run($argv, $argc){
return;
}
$a->set_baseurl(Config::get('system', 'url'));
load_hooks();
$a->start_process();
if (poller_max_connections_reached()) {
@@ -465,7 +469,7 @@ function poller_too_much_workers() {
// Are there fewer workers running as possible? Then fork a new one.
if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
$args = array("php", "include/poller.php", "no_cron");
$args = array("include/poller.php", "no_cron");
$a = get_app();
$a->proc_run($args);
}
@@ -576,7 +580,7 @@ function poller_worker_process() {
* @brief Call the front end worker
*/
function call_worker() {
if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
if (!Config::get("system", "frontend_worker")) {
return;
}
@@ -588,7 +592,7 @@ function call_worker() {
* @brief Call the front end worker if there aren't any active
*/
function call_worker_if_idle() {
if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
if (!Config::get("system", "frontend_worker")) {
return;
}
@@ -615,7 +619,7 @@ function call_worker_if_idle() {
logger('Call poller', LOGGER_DEBUG);
$args = array("php", "include/poller.php", "no_cron");
$args = array("include/poller.php", "no_cron");
$a = get_app();
$a->proc_run($args);
return;