sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send ignored_files as a string to wings

This commit is contained in:
Matthew Penner 2020-12-22 19:31:52 -07:00
parent 5d03c0d2e5
commit 4b9eab8950
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Repositories/Wings/DaemonBackupRepository.php
View File

@ -2,6 +2,7 @@
namespace Pterodactyl\Repositories\Wings; namespace Pterodactyl\Repositories\Wings;
use Illuminate\Support\Arr;
use Webmozart\Assert\Assert; use Webmozart\Assert\Assert;
use Pterodactyl\Models\Backup; use Pterodactyl\Models\Backup;
use Pterodactyl\Models\Server; use Pterodactyl\Models\Server;
@ -48,7 +49,7 @@ class DaemonBackupRepository extends DaemonRepository
'json' => [ 'json' => [
'adapter' => $this->adapter ?? config('backups.default'), 'adapter' => $this->adapter ?? config('backups.default'),
'uuid' => $backup->uuid, 'uuid' => $backup->uuid,
'ignored_files' => $backup->ignored_files, 'ignore' => implode('\n', $backup->ignored_files),
], ],
] ]
); );

4
app/Services/Backups/InitiateBackupService.php
View File

@ -117,9 +117,9 @@ class InitiateBackupService
} }
// Check if the server has reached or exceeded it's backup limit // Check if the server has reached or exceeded it's backup limit
if (!$server->backup_limit || $server->backups()->where('is_successful', true)->count() >= $server->backup_limit) { if (! $server->backup_limit || $server->backups()->where('is_successful', true)->count() >= $server->backup_limit) {
// Do not allow the user to continue if this server is already at its limit and can't override. // Do not allow the user to continue if this server is already at its limit and can't override.
if (!$override || $server->backup_limit <= 0) { if (! $override || $server->backup_limit <= 0) {
throw new TooManyBackupsException($server->backup_limit); throw new TooManyBackupsException($server->backup_limit);
} }