From dd428cf4fc1ec043eea99e8d909cc21c5e214d26 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Nov 2012 19:52:10 -0800
Subject: rm pidfile stuff since we won't need poller locking

---
 include/onepoll.php |  1 -
 include/pidfile.php | 32 --------------------------------
 include/poller.php  | 11 -----------
 3 files changed, 44 deletions(-)
 delete mode 100644 include/pidfile.php

(limited to 'include')

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'));
 
-- 
cgit v1.2.3