Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eggs: remove config_logs field

Browse source
This commit is contained in:
Matthew Penner 2022-12-14 18:10:12 -07:00
parent 3670dc6d4b
commit f68c46b0a0
No known key found for this signature in database
4 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Models/Egg.php
View file

@ -20,7 +20,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property array|null $file_denylist * @property array|null $file_denylist
* @property string|null $config_files * @property string|null $config_files
* @property string|null $config_startup * @property string|null $config_startup
* @property string|null $config_logs
* @property string|null $config_stop * @property string|null $config_stop
* @property int|null $config_from * @property int|null $config_from
* @property string|null $startup * @property string|null $startup
@ -36,7 +35,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property string $copy_script_container * @property string $copy_script_container
* @property string|null $inherit_config_files * @property string|null $inherit_config_files
* @property string|null $inherit_config_startup * @property string|null $inherit_config_startup
* @property string|null $inherit_config_logs
* @property string|null $inherit_config_stop * @property string|null $inherit_config_stop
* @property string $inherit_file_denylist * @property string $inherit_file_denylist
* @property array|null $inherit_features * @property array|null $inherit_features
@ -88,7 +86,6 @@ class Egg extends Model
'file_denylist', 'file_denylist',
'config_files', 'config_files',
'config_startup', 'config_startup',
'config_logs',
'config_stop', 'config_stop',
'config_from', 'config_from',
'startup', 'startup',
@ -128,7 +125,6 @@ class Egg extends Model
'config_from' => 'sometimes|bail|nullable|numeric|exists:eggs,id', 'config_from' => 'sometimes|bail|nullable|numeric|exists:eggs,id',
'config_stop' => 'required_without:config_from|nullable|string|max:191', 'config_stop' => 'required_without:config_from|nullable|string|max:191',
'config_startup' => 'required_without:config_from|nullable|json', 'config_startup' => 'required_without:config_from|nullable|json',
'config_logs' => 'required_without:config_from|nullable|json',
'config_files' => 'required_without:config_from|nullable|json', 'config_files' => 'required_without:config_from|nullable|json',
'update_url' => 'sometimes|nullable|string', 'update_url' => 'sometimes|nullable|string',
'force_outgoing_ip' => 'sometimes|boolean', 'force_outgoing_ip' => 'sometimes|boolean',
@ -139,7 +135,6 @@ class Egg extends Model
'file_denylist' => null, 'file_denylist' => null,
'config_stop' => null, 'config_stop' => null,
'config_startup' => null, 'config_startup' => null,
'config_logs' => null,
'config_files' => null, 'config_files' => null,
'update_url' => null, 'update_url' => null,
]; ];
@ -207,18 +202,6 @@ class Egg extends Model
return $this->configFrom->config_startup; return $this->configFrom->config_startup;
} }
/**
* Return the log reading configuration for an egg.
*/
public function getInheritConfigLogsAttribute(): ?string
{
if (!is_null($this->config_logs) || is_null($this->config_from)) {
return $this->config_logs;
}
return $this->configFrom->config_logs;
}
/** /**
* Return the stop command configuration for an egg. * Return the stop command configuration for an egg.
*/ */

1
app/Services/Eggs/EggParserService.php
View file

@ -38,7 +38,6 @@ class EggParserService
'update_url' => Arr::get($parsed, 'meta.update_url'), 'update_url' => Arr::get($parsed, 'meta.update_url'),
'config_files' => Arr::get($parsed, 'config.files'), 'config_files' => Arr::get($parsed, 'config.files'),
'config_startup' => Arr::get($parsed, 'config.startup'), 'config_startup' => Arr::get($parsed, 'config.startup'),
'config_logs' => Arr::get($parsed, 'config.logs'),
'config_stop' => Arr::get($parsed, 'config.stop'), 'config_stop' => Arr::get($parsed, 'config.stop'),
'startup' => Arr::get($parsed, 'startup'), 'startup' => Arr::get($parsed, 'startup'),
'script_install' => Arr::get($parsed, 'scripts.installation.script'), 'script_install' => Arr::get($parsed, 'scripts.installation.script'),

1
app/Services/Eggs/Sharing/EggExporterService.php
View file

@ -45,7 +45,6 @@ class EggExporterService
'config' => [ 'config' => [
'files' => $egg->inherit_config_files, 'files' => $egg->inherit_config_files,
'startup' => $egg->inherit_config_startup, 'startup' => $egg->inherit_config_startup,
'logs' => $egg->inherit_config_logs,
'stop' => $egg->inherit_config_stop, 'stop' => $egg->inherit_config_stop,
], ],
'scripts' => [ 'scripts' => [

1
app/Transformers/Api/Application/EggTransformer.php
View file

@ -86,7 +86,6 @@ class EggTransformer extends Transformer
'files' => json_decode($model->inherit_config_files), 'files' => json_decode($model->inherit_config_files),
'startup' => json_decode($model->inherit_config_startup), 'startup' => json_decode($model->inherit_config_startup),
'stop' => $model->inherit_config_stop, 'stop' => $model->inherit_config_stop,
'logs' => json_decode($model->inherit_config_logs),
]; ];
}); });
} }