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

Dead processes will be deleted when they are running for more than 9 minutes.

Browse source
This commit is contained in:
Michael Vogel 2014-05-22 00:16:36 +02:00
parent 58cea13707
commit e32f9c4fff
5 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/cronhooks.php
View file

@ -37,9 +37,15 @@ function cronhooks_run(&$argv, &$argc){
$lockpath = get_config('system','lockpath'); $lockpath = get_config('system','lockpath');
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'cron.lck'); $pidfile = new pidfile($lockpath, 'cronhooks');
if($pidfile->is_already_running()) { if($pidfile->is_already_running()) {
logger("cronhooks: Already running"); logger("cronhooks: Already running");
if ($pidfile->running_time() > 9*60) {
$pidfile->kill();
logger("cronhooks: killed stale process");
// Calling a new instance
proc_run('php','include/cronhooks.php');
}
exit; exit;
} }
} }
@ -52,8 +58,6 @@ function cronhooks_run(&$argv, &$argc){
$d = datetime_convert(); $d = datetime_convert();
set_time_limit(9*60*60); // Setting the maximum execution time for cronjobs to 9 minutes.
call_hooks('cron', $d); call_hooks('cron', $d);
logger('cronhooks: end'); logger('cronhooks: end');

2
include/onepoll.php
View file

@ -60,7 +60,7 @@ function onepoll_run(&$argv, &$argc){
// Test // Test
$lockpath = get_config('system','lockpath'); $lockpath = get_config('system','lockpath');
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'onepoll'.$contact_id.'.lck'); $pidfile = new pidfile($lockpath, 'onepoll'.$contact_id);
if($pidfile->is_already_running()) { if($pidfile->is_already_running()) {
logger("onepoll: Already running for contact ".$contact_id); logger("onepoll: Already running for contact ".$contact_id);
exit; exit;

9
include/pidfile.php
View file

@ -28,5 +28,14 @@ class pidfile {
public function is_already_running() { public function is_already_running() {
return $this->_running; return $this->_running;
} }
public function running_time() {
return(time() - filectime($this->_file));
}
public function kill() {
if (file_exists($this->_file))
return(posix_kill(file_get_contents($this->_file), SIGTERM));
}
} }
?> ?>

8
include/poller.php
View file

@ -43,9 +43,15 @@ function poller_run(&$argv, &$argc){
$lockpath = get_config('system','lockpath'); $lockpath = get_config('system','lockpath');
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'poller.lck'); $pidfile = new pidfile($lockpath, 'poller');
if($pidfile->is_already_running()) { if($pidfile->is_already_running()) {
logger("poller: Already running"); logger("poller: Already running");
if ($pidfile->running_time() > 9*60) {
$pidfile->kill();
logger("poller: killed stale process");
// Calling a new instance
proc_run('php','include/poller.php');
}
exit; exit;
} }
} }

10
include/queue.php
View file

@ -86,9 +86,15 @@ function queue_run(&$argv, &$argc){
$lockpath = get_config('system','lockpath'); $lockpath = get_config('system','lockpath');
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'queue.lck'); $pidfile = new pidfile($lockpath, 'queue');
if($pidfile->is_already_running()) { if($pidfile->is_already_running()) {
logger("queue: Already running"); logger("queue: Already running");
if ($pidfile->running_time() > 9*60) {
$pidfile->kill();
logger("queue: killed stale process");
// Calling a new instance
proc_run('php',"include/queue.php");
}
return; return;
} }
} }
@ -106,8 +112,6 @@ function queue_run(&$argv, &$argc){
logger('queue: start'); logger('queue: start');
set_time_limit(9*60*60); // Setting the maximum execution time for queue job to 9 minutes.
handle_pubsubhubbub(); handle_pubsubhubbub();
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));