GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DAEMONS] Properly disconnect daemons from the database

Browse Source
This commit is contained in:
Alexei Sorokin
2019-09-10 20:25:28 +03:00
committed by Diogo Peralta Cordeiro
parent cb412d228c
commit 72f5576795
2 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
lib/util/spawningdaemon.php
View File

@@ -1,21 +1,20 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2010, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
defined('GNUSOCIAL') || die();
/**
* Base class for daemon that can launch one or more processing threads,
@@ -24,7 +23,7 @@
* This is mainly intended for indefinite workloads such as monitoring
* a queue or maintaining an IM channel.
*
* Child classes should implement the
* Child classes should implement the
*
* We can then pass individual items through the QueueHandler subclasses
* they belong to. We additionally can handle queues for multiple sites.
@@ -34,14 +33,14 @@
*/
abstract class SpawningDaemon extends Daemon
{
protected $threads=1;
protected $threads = 1;
const EXIT_OK = 0;
const EXIT_ERR = 1;
const EXIT_SHUTDOWN = 100;
const EXIT_RESTART = 101;
function __construct($id=null, $daemonize=true, $threads=1)
public function __construct($id = null, $daemonize = true, $threads = 1)
{
parent::__construct($daemonize);
@@ -56,7 +55,7 @@ abstract class SpawningDaemon extends Daemon
*
* @return int exit code; use self::EXIT_SHUTDOWN to request not to respawn.
*/
public abstract function runThread();
abstract public function runThread();
/**
* Spawn one or more background processes and let them start running.
@@ -69,17 +68,17 @@ abstract class SpawningDaemon extends Daemon
* though ParallelizingDaemon is probably better for workloads
* that have forseeable endpoints.
*/
function run()
public function run()
{
$this->initPipes();
$children = array();
$children = [];
for ($i = 1; $i <= $this->threads; $i++) {
$pid = pcntl_fork();
if ($pid < 0) {
$this->log(LOG_ERR, "Couldn't fork for thread $i; aborting\n");
exit(1);
} else if ($pid == 0) {
} elseif ($pid === 0) {
$this->initAndRunChild($i);
} else {
$this->log(LOG_INFO, "Spawned thread $i as pid $pid");
@@ -87,7 +86,7 @@ abstract class SpawningDaemon extends Daemon
}
sleep(common_config('queue', 'spawndelay'));
}
$this->log(LOG_INFO, "Waiting for children to complete.");
while (count($children) > 0) {
$status = null;
@@ -101,7 +100,7 @@ abstract class SpawningDaemon extends Daemon
if (pcntl_wifexited($status)) {
$exitCode = pcntl_wexitstatus($status);
$info = "status $exitCode";
} else if (pcntl_wifsignaled($status)) {
} elseif (pcntl_wifsignaled($status)) {
$exitCode = self::EXIT_ERR;
$signal = pcntl_wtermsig($status);
$info = "signal $signal";
@@ -114,7 +113,7 @@ abstract class SpawningDaemon extends Daemon
$pid = pcntl_fork();
if ($pid < 0) {
$this->log(LOG_ERR, "Couldn't fork to respawn thread $i; aborting thread.\n");
} else if ($pid == 0) {
} elseif ($pid === 0) {
$this->initAndRunChild($i);
} else {
$this->log(LOG_INFO, "Respawned thread $i as pid $pid");
@@ -134,7 +133,7 @@ abstract class SpawningDaemon extends Daemon
* Create an IPC socket pair which child processes can use to detect
* if the parent process has been killed.
*/
function initPipes()
public function initPipes()
{
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if ($sockets) {
@@ -197,10 +196,19 @@ abstract class SpawningDaemon extends Daemon
*/
protected function resetDb()
{
// @fixme do we need to explicitly open the db too
// or is this implied?
global $_DB_DATAOBJECT;
unset($_DB_DATAOBJECT['CONNECTIONS']);
// Can't be called statically
$user = new User();
$conn = $user->getDatabaseConnection();
$conn->disconnect();
// Remove the disconnected connection from the list
foreach ($_DB_DATAOBJECT['CONNECTIONS'] as $k => $v) {
if ($v === $conn) {
unset($_DB_DATAOBJECT['CONNECTIONS'][$k]);
}
}
// Reconnect main memcached, or threads will stomp on
// each other and corrupt their requests.
@@ -216,14 +224,13 @@ abstract class SpawningDaemon extends Daemon
}
}
function log($level, $msg)
public function log($level, $msg)
{
common_log($level, get_class($this) . ' ('. $this->get_id() .'): '.$msg);
}
function name()
public function name()
{
return strtolower(get_class($this).'.'.$this->get_id());
}
}