StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update logic for tracking a server's transfer state

Browse source
This commit is contained in:
Matthew Penner 2020-12-16 09:34:47 -07:00
parent 5d03c0d2e5
commit e6c4a68e4a
20 changed files with 206 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/Services/Servers/GetUserPermissionsService.php
View file

@ -24,6 +24,7 @@ class GetUserPermissionsService
if ($user->root_admin) {
$permissions[] = 'admin.websocket.errors';
$permissions[] = 'admin.websocket.install';
$permissions[] = 'admin.websocket.transfer';
}
return $permissions;

5
app/Services/Servers/SuspensionService.php
View file

@ -61,7 +61,10 @@ class SuspensionService
'suspended' => $action === self::ACTION_SUSPEND,
]);
$this->daemonServerRepository->setServer($server)->suspend($action === self::ACTION_UNSUSPEND);
// Only send the suspension request to wings if the server is not currently being transferred.
if ($server->transfer === null) {
$this->daemonServerRepository->setServer($server)->suspend($action === self::ACTION_UNSUSPEND);
}
});
}
}