Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-01-08 19:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix duplicate usage of the $mode variable

Browse source
This commit is contained in:
Art4 2024-12-28 23:36:15 +00:00
parent 0fd84f5864
commit 3309bc818a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/App.php
View file

@ -480,18 +480,18 @@ class App
$pidfile = $config->get('jetstream', 'pidfile'); $pidfile = $config->get('jetstream', 'pidfile');
if (in_array('start', (array)$_SERVER['argv'])) { if (in_array('start', (array)$_SERVER['argv'])) {
$mode = 'start'; $daemonMode = 'start';
} }
if (in_array('stop', (array)$_SERVER['argv'])) { if (in_array('stop', (array)$_SERVER['argv'])) {
$mode = 'stop'; $daemonMode = 'stop';
} }
if (in_array('status', (array)$_SERVER['argv'])) { if (in_array('status', (array)$_SERVER['argv'])) {
$mode = 'status'; $daemonMode = 'status';
} }
if (!isset($mode)) { if (!isset($daemonMode)) {
die("Please use either 'start', 'stop' or 'status'.\n"); die("Please use either 'start', 'stop' or 'status'.\n");
} }
@ -512,11 +512,11 @@ class App
$pid = intval(file_get_contents($pidfile)); $pid = intval(file_get_contents($pidfile));
} }
if (empty($pid) && in_array($mode, ['stop', 'status'])) { if (empty($pid) && in_array($daemonMode, ['stop', 'status'])) {
die("Pidfile wasn't found. Is jetstream running?\n"); die("Pidfile wasn't found. Is jetstream running?\n");
} }
if ($mode == 'status') { if ($daemonMode == 'status') {
if (posix_kill($pid, 0)) { if (posix_kill($pid, 0)) {
die("Jetstream process $pid is running.\n"); die("Jetstream process $pid is running.\n");
} }
@ -526,7 +526,7 @@ class App
die("Jetstream process $pid isn't running.\n"); die("Jetstream process $pid isn't running.\n");
} }
if ($mode == 'stop') { if ($daemonMode == 'stop') {
posix_kill($pid, SIGTERM); posix_kill($pid, SIGTERM);
unlink($pidfile); unlink($pidfile);