diff --git a/app/Http/Livewire/Project/Database/Heading.php b/app/Http/Livewire/Project/Database/Heading.php index 7b2796c85..fc867ce79 100644 --- a/app/Http/Livewire/Project/Database/Heading.php +++ b/app/Http/Livewire/Project/Database/Heading.php @@ -6,7 +6,6 @@ use App\Actions\Database\StartPostgresql; use App\Actions\Database\StartRedis; use App\Actions\Database\StopDatabase; use App\Jobs\ContainerStatusJob; -use App\Notifications\Application\StatusChanged; use Livewire\Component; class Heading extends Component @@ -29,7 +28,6 @@ class Heading extends Component { dispatch_sync(new ContainerStatusJob($this->database->destination->server)); $this->database->refresh(); - $this->emit('refresh'); } public function mount() diff --git a/app/Http/Livewire/Project/Database/Redis/General.php b/app/Http/Livewire/Project/Database/Redis/General.php index 6979a739a..c0d3b2f0b 100644 --- a/app/Http/Livewire/Project/Database/Redis/General.php +++ b/app/Http/Livewire/Project/Database/Redis/General.php @@ -82,9 +82,9 @@ class General extends Component public function getDbUrl() { if ($this->database->is_public) { - $this->db_url = "redis://{$this->database->redis_password}@{$this->database->destination->server->getIp}:{$this->database->public_port}/0"; + $this->db_url = "redis://:{$this->database->redis_password}@{$this->database->destination->server->getIp}:{$this->database->public_port}/0"; } else { - $this->db_url = "redis://{$this->database->redis_password}@{$this->database->uuid}:5432/0"; + $this->db_url = "redis://:{$this->database->redis_password}@{$this->database->uuid}:6379/0"; } } public function render() diff --git a/app/Jobs/StopResourceJob.php b/app/Jobs/StopResourceJob.php index a702d83f3..0bfc1f2fa 100644 --- a/app/Jobs/StopResourceJob.php +++ b/app/Jobs/StopResourceJob.php @@ -45,10 +45,11 @@ class StopResourceJob implements ShouldQueue, ShouldBeEncrypted StopService::run($this->resource); break; } - $this->resource->delete(); } catch (\Throwable $e) { send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage()); throw $e; + } finally { + $this->resource->delete(); } } } diff --git a/config/sentry.php b/config/sentry.php index 83b5e5e5f..fd7d35889 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.84', + 'release' => '4.0.0-beta.85', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index e9a5cd388..4076867dc 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@