harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rm pidfile stuff since we won't need poller locking

Browse Source
This commit is contained in:
friendica
2012-11-29 19:52:10 -08:00
parent 061a279ed3
commit dd428cf4fc
4 changed files with 8 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/onepoll.php
View File

@@ -24,7 +24,6 @@ function onepoll_run($argv, $argc){
require_once('include/Contact.php');
require_once('include/email.php');
require_once('include/socgraph.php');
require_once('include/pidfile.php');
require_once('include/queue_fn.php');
load_config('config');

32
include/pidfile.php
View File

@@ -1,32 +0,0 @@
<?php
class pidfile {
private $_file;
private $_running;
public function __construct($dir, $name) {
$this->_file = "$dir/$name.pid";
if (file_exists($this->_file)) {
$pid = trim(file_get_contents($this->_file));
if (posix_kill($pid, 0)) {
$this->_running = true;
}
}
if (! $this->_running) {
$pid = getmypid();
file_put_contents($this->_file, $pid);
}
}
public function __destruct() {
if ((! $this->_running) && file_exists($this->_file)) {
unlink($this->_file);
}
}
public function is_already_running() {
return $this->_running;
}
}
?>

11
include/poller.php
View File

@@ -24,7 +24,6 @@ function poller_run($argv, $argc){
require_once('include/items.php');
require_once('include/Contact.php');
require_once('include/socgraph.php');
require_once('include/pidfile.php');
load_config('config');
load_config('system');
@@ -40,16 +39,6 @@ function poller_run($argv, $argc){
}
}
$lockpath = get_config('system','lockpath');
if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'poller.lck');
if($pidfile->is_already_running()) {
logger("poller: Already running");
exit;
}
}
$a->set_baseurl(get_config('system','url'));