Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 16:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reworked the pidfile class

Browse source
This commit is contained in:
Michael 2017-12-09 17:49:11 +00:00
parent 0f149a691e
commit 38d5932156
2 changed files with 93 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Util/ExAuth.php
View file

@ -46,7 +46,6 @@ class ExAuth
{ {
private $bDebug; private $bDebug;
private $host; private $host;
private $pidfile;
/** /**
* @brief Create the class * @brief Create the class
@ -313,21 +312,18 @@ class ExAuth
return; return;
} }
$this->pidfile = new Pidfile($lockpath, $host); $file = $lockpath . DIRECTORY_SEPARATOR . $host;
if ($this->pidfile->isRunning()) { if (Pidfile::isRunningProcess($file)) {
$oldpid = $this->pidfile->pid(); if (PidFile::killProcess($file)) {
$this->writeLog(LOG_INFO, 'Process ' . $oldpid . ' was running for ' . $this->pidfile->runningTime() . ' seconds and will now be killed'); $this->writeLog(LOG_INFO, 'Old process was successfully killed');
$this->pidfile->kill(); } else {
$this->writeLog(LOG_ERR, "The old Process wasn't killed in time. We now quit our process.");
// Wait until the other process is hopefully killed
sleep(2);
$this->pidfile = new Pidfile($lockpath, $host);
if ($oldpid == $this->pidfile->pid()) {
$this->writeLog(LOG_ERR, 'Process ' . $oldpid . "wasn't killed in time. We now quit our process.");
die(); die();
} }
} }
// Now it is safe to create the pid file
Pidfile::create($file);
} }
/** /**

126
src/Util/Pidfile.php
View file

@ -9,78 +9,100 @@ namespace Friendica\Util;
*/ */
class Pidfile class Pidfile
{ {
private $file;
private $running;
private $pid;
/** /**
* @param string $dir path * @brief Read the pid from a given pid file
* @param string $name filename *
* @return void * @param string $file Filename of pid file
*
* @return boolean|string PID or "false" if not existent
*/ */
public function __construct($dir, $name) static private function pidFromFile($file) {
{ if (!file_exists($file)) {
$this->file = "$dir/$name"; return false;
$this->running = false;
if (file_exists($this->file)) {
$this->pid = trim(@file_get_contents($this->file));
if (($this->pid != "") && posix_kill($this->pid, 0)) {
$this->running = true;
}
} }
if (!$this->running) { return trim(@file_get_contents($file));
$this->pid = getmypid();
file_put_contents($this->file, $this->pid);
}
} }
/** /**
* @return void * @brief Is there a running process with the given pid file
*/ *
public function __destruct() * @param string $file Filename of pid file
{ *
if (!$this->running && file_exists($this->file)) {
@unlink($this->file);
}
}
/**
* @brief Check if a process with this pid file is already running
* @return boolean Is it running? * @return boolean Is it running?
*/ */
public function isRunning() static public function isRunningProcess($file) {
{ $pid = self::pidFromFile($file);
return $this->running;
if (!$pid) {
return false;
}
// Is the process running?
$running = posix_kill($pid, 0);
// If not, then we will kill the stale file
if (!$running) {
self::delete($file);
}
return $running;
} }
/** /**
* @brief Return the pid of the process * @brief Kills a process from a given pid file
* @return boolean process id *
* @param string $file Filename of pid file
*
* @return boolean Was it killed successfully?
*/ */
public function pid() static public function killProcess($file) {
{ $pid = self::pidFromFile($file);
return $this->pid;
// We don't have a process id? then we quit
if (!$pid) {
return false;
}
// We now kill the process
$killed = posix_kill($pid, SIGTERM);
// If we killed the process successfully, we can remove the pidfile
if ($killed) {
self::delete($file);
}
return $killed;
} }
/** /**
* @brief Returns the seconds that the old process was running * @brief Creates a pid file
* @return integer run time of the old process *
* @param string $file Filename of pid file
*
* @return boolean|string PID or "false" if not created
*/ */
public function runningTime() static public function create($file) {
{ $pid = self::pidFromFile($file);
return time() - @filectime($this->file);
// We have a process id? then we quit
if ($pid) {
return false;
}
$pid = getmypid();
file_put_contents($file, $pid);
// Now we check if everything is okay
return self::pidFromFile($file);
} }
/** /**
* @brief Kills the old process * @brief Deletes a given pid file
* @return boolean *
* @param string $file Filename of pid file
*
* @return boolean Is it running?
*/ */
public function kill() static public function delete($file) {
{ return @unlink($file);
if (!empty($this->pid)) {
return posix_kill($this->pid, SIGTERM);
}
} }
} }