dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: proxy configuration saving

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-18 12:18:45 +02:00
parent 026f3fd72d
commit 61f58fa30f
9 changed files with 207 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Livewire/Server/Proxy.php
View File

@@ -2,9 +2,8 @@
namespace App\Http\Livewire\Server;
use App\Actions\Proxy\CheckConfigurationSync;
use App\Actions\Proxy\SaveConfigurationSync;
use App\Enums\ProxyTypes;
use App\Actions\Proxy\CheckConfiguration;
use App\Actions\Proxy\SaveConfiguration;
use App\Models\Server;
use Livewire\Component;
@@ -48,8 +47,7 @@ class Proxy extends Component
public function submit()
{
try {
resolve(SaveConfigurationSync::class)($this->server);
SaveConfiguration::run($this->server);
$this->server->proxy->redirect_url = $this->redirect_url;
$this->server->save();
@@ -63,7 +61,7 @@ class Proxy extends Component
public function reset_proxy_configuration()
{
try {
$this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
$this->proxy_settings = CheckConfiguration::run($this->server, true);
} catch (\Throwable $e) {
return handleError($e);
}
@@ -72,8 +70,7 @@ class Proxy extends Component
public function loadProxyConfiguration()
{
try {
ray('loadProxyConfiguration');
$this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
$this->proxy_settings = CheckConfiguration::run($this->server);
} catch (\Throwable $e) {
return handleError($e);
}

25
app/Http/Livewire/Server/Proxy/Deploy.php
View File

@@ -2,7 +2,7 @@
namespace App\Http\Livewire\Server\Proxy;
use App\Actions\Proxy\SaveConfigurationSync;
use App\Actions\Proxy\SaveConfiguration;
use App\Actions\Proxy\StartProxy;
use App\Models\Server;
use Livewire\Component;
@@ -13,20 +13,25 @@ class Deploy extends Component
public $proxy_settings = null;
protected $listeners = ['proxyStatusUpdated'];
public function proxyStatusUpdated() {
public function proxyStatusUpdated()
{
$this->server->refresh();
}
public function startProxy()
{
if (
$this->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
resolve(SaveConfigurationSync::class)($this->server);
}
try {
if (
$this->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
SaveConfiguration::run($this->server);
}
$activity = resolve(StartProxy::class)($this->server);
$this->emit('newMonitorActivity', $activity->id);
$activity = resolve(StartProxy::class)($this->server);
$this->emit('newMonitorActivity', $activity->id);
} catch (\Throwable $e) {
return handleError($e);
}
}
public function stop()