direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-07-02 14:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix create queue with root user (#409)

Browse Source 
* fix create queue with root user

* fix

* fix queues for root user
This commit is contained in:
Saeed Vaziry
2024-12-30 02:33:00 -08:00
committed by GitHub
parent dfdd50beb7
commit 8b86ff23c9
9 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/SSH/Services/ProcessManager/ProcessManager.php
View File

@ -23,5 +23,5 @@ public function stop(int $id, ?int $siteId = null): void;
public function start(int $id, ?int $siteId = null): void;
public function getLogs(string $logPath): string;
public function getLogs(string $user, string $logPath): string;
}

26
app/SSH/Services/ProcessManager/Supervisor.php
View File

@ -40,18 +40,22 @@ public function create(
string $logFile,
?int $siteId = null
): void {
$this->service->server->ssh()->write(
"/etc/supervisor/conf.d/$id.conf",
$this->generateConfigFile(
$id,
$command,
$user,
$autoStart,
$autoRestart,
$numprocs,
$logFile
),
true
);
$this->service->server->ssh($user)->exec(
$this->getScript('supervisor/create-worker.sh', [
'id' => $id,
'config' => $this->generateConfigFile(
$id,
$command,
$user,
$autoStart,
$autoRestart,
$numprocs,
$logFile
),
]),
'create-worker',
$siteId
@ -117,9 +121,9 @@ public function start(int $id, ?int $siteId = null): void
/**
* @throws Throwable
*/
public function getLogs(string $logPath): string
public function getLogs(string $user, string $logPath): string
{
return $this->service->server->ssh()->exec(
return $this->service->server->ssh($user)->exec(
"tail -100 $logPath"
);
}

4
app/SSH/Services/ProcessManager/scripts/supervisor/create-worker.sh
View File

@ -4,10 +4,6 @@ mkdir -p ~/.logs/workers
touch ~/.logs/workers/__id__.log
if ! echo '__config__' | sudo tee /etc/supervisor/conf.d/__id__.conf; then
echo 'VITO_SSH_ERROR' && exit 1
fi
if ! sudo supervisorctl reread; then
echo 'VITO_SSH_ERROR' && exit 1
fi