Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

chore: prepare for PR

Andras Bacsaif05b7106cfb7
diff --git a/app/Actions/Database/StartDatabaseProxy.php b/app/Actions/Database/StartDatabaseProxy.php
index bebc056c5c..4331c6ae7a 100644
--- a/app/Actions/Database/StartDatabaseProxy.php
+++ b/app/Actions/Database/StartDatabaseProxy.php
@@ -113,16 +113,14 @@ class StartDatabaseProxy
$nginxconf_base64 = base64_encode($nginxconf);
instant_remote_process(["docker rm -f $proxyContainerName"], $server, false);
- try {
-
try {
instant_remote_process([
- "mkdir -p $configuration_dir",
- "echo '{$nginxconf_base64}' | base64 -d | tee $configuration_dir/nginx.conf > /dev/null",
- "echo '{$dockercompose_base64}' | base64 -d | tee $configuration_dir/docker-compose.yaml > /dev/null",
- "docker compose --project-directory {$configuration_dir} pull",
- "docker compose --project-directory {$configuration_dir} up -d",
- ], $server);
+ "mkdir -p $configuration_dir",
+ "echo '{$nginxconf_base64}' | base64 -d | tee $configuration_dir/nginx.conf > /dev/null",
+ "echo '{$dockercompose_base64}' | base64 -d | tee $configuration_dir/docker-compose.yaml > /dev/null",
+ "docker compose --project-directory {$configuration_dir} pull",
+ "docker compose --project-directory {$configuration_dir} up -d",
+ ], $server);
} catch (\RuntimeException $e) {
if ($this->isNonTransientError($e->getMessage())) {
$database->update(['is_public' => false]);
@@ -146,44 +144,6 @@ class StartDatabaseProxy
}
}
- private function isNonTransientError(string $message): bool
- {
- $nonTransientPatterns = [
- 'port is already allocated',
- 'address already in use',
- 'Bind for',
- ];
-
- foreach ($nonTransientPatterns as $pattern) {
- if (str_contains($message, $pattern)) {
- return true;
- }
- }
-
- return false;
- } catch (\RuntimeException $e) {
- if ($this->isNonTransientError($e->getMessage())) {
- $database->update(['is_public' => false]);
-
- $team = data_get($database, 'environment.project.team')
- ?? data_get($database, 'service.environment.project.team');
-
- $team?->notify(
- new \App\Notifications\Container\ContainerRestarted(
- "TCP Proxy for {$database->name} was disabled due to error: {$e->getMessage()}",
- $server,
- )
- );
-
- ray("Database proxy for {$database->name} disabled due to non-transient error: {$e->getMessage()}");
-
- return;
- }
-
- throw $e;
- }
- }
-
private function isNonTransientError(string $message): bool
{
$nonTransientPatterns = [