Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor database and application start scripts

Browse Source
This commit is contained in:
Andras Bacsai 2024-01-12 14:15:15 +01:00
parent 5e7c6906b3
commit 27b18fbedf
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Database/StartMariadb.php
View File

@ -68,7 +68,7 @@ class StartMariadb
] ]
] ]
]; ];
if ($this->database->limits_cpuset !== 0) { if (!is_null($this->database->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {

2
app/Actions/Database/StartMongodb.php
View File

@ -75,7 +75,7 @@ class StartMongodb
] ]
] ]
]; ];
if ($this->database->limits_cpuset !== 0) { if (!is_null($this->database->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {

2
app/Actions/Database/StartMysql.php
View File

@ -68,7 +68,7 @@ class StartMysql
] ]
] ]
]; ];
if ($this->database->limits_cpuset !== 0) { if (!is_null($this->database->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {

2
app/Actions/Database/StartPostgresql.php
View File

@ -78,7 +78,7 @@ class StartPostgresql
] ]
] ]
]; ];
if ($this->database->limits_cpuset !== 0) { if (!is_null($this->database->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {

2
app/Actions/Database/StartRedis.php
View File

@ -77,7 +77,7 @@ class StartRedis
] ]
] ]
]; ];
if ($this->database->limits_cpuset !== 0) { if (!is_null($this->database->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
} }
if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {

2
app/Jobs/ApplicationDeploymentJob.php
View File

@ -1027,7 +1027,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
] ]
] ]
]; ];
if ($this->application->limits_cpuset !== 0) { if (!is_null($this->application->limits_cpuset)) {
data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset); data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
} }
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {

2
app/Models/Application.php
View File

@ -653,7 +653,7 @@ class Application extends BaseModel
] ]
] ]
]; ];
if ($this->limits_cpuset !== 0) { if (!is_null($this->limits_cpuset)) {
data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset); data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset);
} }
if ($server->isSwarm()) { if ($server->isSwarm()) {

2
bootstrap/helpers/applications.php
View File

@ -178,7 +178,7 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
] ]
] ]
]; ];
if ($application->limits_cpuset !== 0) { if (!is_null($application->limits_cpuset)) {
data_set($docker_compose, "services.{$containerName}.cpuset", $application->limits_cpuset); data_set($docker_compose, "services.{$containerName}.cpuset", $application->limits_cpuset);
} }
if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) { if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) {