aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-29 19:52:10 -0800
committerfriendica <info@friendica.com>2012-11-29 19:52:10 -0800
commitdd428cf4fc1ec043eea99e8d909cc21c5e214d26 (patch)
treea1f953b07a739ca72a112214ab530a617a59952b
parent061a279ed3e40856c85baf54a27ef89bb860b056 (diff)
downloadvolse-hubzilla-dd428cf4fc1ec043eea99e8d909cc21c5e214d26.tar.gz
volse-hubzilla-dd428cf4fc1ec043eea99e8d909cc21c5e214d26.tar.bz2
volse-hubzilla-dd428cf4fc1ec043eea99e8d909cc21c5e214d26.zip
rm pidfile stuff since we won't need poller locking
-rw-r--r--done17
-rw-r--r--include/onepoll.php1
-rw-r--r--include/pidfile.php32
-rw-r--r--include/poller.php11
4 files changed, 8 insertions, 53 deletions
diff --git a/done b/done
index af3e7fcb3..55e2c7ed3 100644
--- a/done
+++ b/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
diff --git a/include/onepoll.php b/include/onepoll.php
index 617756953..f6f266165 100644
--- a/include/onepoll.php
+++ b/include/onepoll.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');
diff --git a/include/pidfile.php b/include/pidfile.php
deleted file mode 100644
index 47df8d1f4..000000000
--- a/include/pidfile.php
+++ /dev/null
@@ -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;
- }
-}
-?>
diff --git a/include/poller.php b/include/poller.php
index 5fc438c8d..5e5d211e4 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -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'));