rm pidfile stuff since we won't need poller locking
This commit is contained in:
parent
061a279ed3
commit
dd428cf4fc
17
done
17
done
@ -30,21 +30,21 @@ include/
|
||||
? crypto.php
|
||||
+ datetime.php (todo: html removal)
|
||||
? dba.php
|
||||
delivery.php
|
||||
? delivery.php
|
||||
+ directory.php
|
||||
- email.php
|
||||
+ enotify.php
|
||||
event.php
|
||||
+ expire.php
|
||||
fcontact.php
|
||||
follow.php
|
||||
? follow.php
|
||||
gprobe.php
|
||||
+ group.php
|
||||
html2bbcode.php
|
||||
html2plain.php
|
||||
+ identity.php
|
||||
iquery.php
|
||||
items.php
|
||||
? items.php
|
||||
+ js_strings.php
|
||||
+ language.php
|
||||
message.php
|
||||
@ -56,7 +56,6 @@ include/
|
||||
oembed.php
|
||||
onepoll.php
|
||||
? Photo.php
|
||||
pidfile.php
|
||||
? plugin.php
|
||||
poller.php
|
||||
? profile_advanced.php
|
||||
@ -109,11 +108,11 @@ mod/
|
||||
friendica.php -> moved to siteinfo.php, require HTML templating, more
|
||||
fsuggest.php
|
||||
+ group.php
|
||||
hcard.php
|
||||
- hcard.php -> not needed
|
||||
help.php
|
||||
+ home.php
|
||||
hostxrd.php
|
||||
install.php
|
||||
hostxrd.php -> probably not needed
|
||||
? install.php
|
||||
invite.php
|
||||
+ item.php
|
||||
+ like.php
|
||||
@ -137,7 +136,7 @@ mod/
|
||||
+ photo.php
|
||||
photos.php
|
||||
+ ping.php (needs more work)
|
||||
poco.php
|
||||
+ poco.php
|
||||
poke.php
|
||||
? post.php
|
||||
+ pretheme.php
|
||||
@ -171,7 +170,7 @@ mod/
|
||||
view.php
|
||||
+ viewsrc.php
|
||||
? wall_attach.php (needs remote permissions refactor)
|
||||
wallmessage.php
|
||||
- wallmessage.php
|
||||
? wall_upload.php (needs remote permissions refactor)
|
||||
webfinger.php
|
||||
+ _well_known.php
|
||||
|
@ -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');
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
?>
|
@ -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'));
|
||||
|
||||
|
Reference in New Issue
Block a user