Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery

[friendica.git] / include / pidfile.php

diff --git a/include/pidfile.php b/include/pidfile.php
index 47df8d1f4624ef43fa2430d013f4000f8edad411..3093e149aeb869acc2c35ca0a49e9087642e7cb6 100644 (file)
--- a/include/pidfile.php
+++ b/include/pidfile.php
@@ -7,8 +7,8 @@ class pidfile {
                $this->_file = "$dir/$name.pid";
 
                if (file_exists($this->_file)) {
-                       $pid = trim(file_get_contents($this->_file));
-                       if (posix_kill($pid, 0)) {
+                       $pid = trim(@file_get_contents($this->_file));
+                       if (($pid != "") AND posix_kill($pid, 0)) {
                                $this->_running = true;
                        }
                }
@@ -21,12 +21,21 @@ class pidfile {
 
        public function __destruct() {
                if ((! $this->_running) && file_exists($this->_file)) {
-                       unlink($this->_file);
+                       @unlink($this->_file);
                }
        }
 
        public function is_already_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));
+       }
 }
 ?>