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

fix: proxy status

Browse Source 
fix: start proxy in case any dns set somewhere
This commit is contained in:
Andras Bacsai
2023-07-14 13:01:55 +02:00
parent 48ad40dea2
commit e9ba295a1e
17 changed files with 130 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Livewire/Project/Application/Status.php
View File

@@ -1,17 +0,0 @@
<?php
namespace App\Http\Livewire\Project\Application;
use App\Models\Application;
use Livewire\Component;
class Status extends Component
{
public Application $application;
public function applicationStatusChanged()
{
$this->application->refresh();
$this->emit('applicationStatusChanged');
}
}

2
app/Http/Livewire/Server/Form.php
View File

@@ -63,7 +63,7 @@ class Form extends Component
} else {
$this->server->settings->is_usable = true;
$this->server->settings->save();
$this->emit('serverValidated');
$this->emit('proxyStatusUpdated');
}
} catch (\Exception $e) {
$this->server->settings->is_reachable = false;

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

@@ -3,7 +3,6 @@
namespace App\Http\Livewire\Server;
use App\Actions\Proxy\CheckProxySettingsInSync;
use App\Actions\Proxy\InstallProxy;
use App\Enums\ProxyTypes;
use Illuminate\Support\Str;
use App\Models\Server;
@@ -17,12 +16,12 @@ class Proxy extends Component
public $proxy_settings = null;
public string|null $redirect_url = null;
protected $listeners = ['serverValidated', 'saveConfiguration'];
protected $listeners = ['proxyStatusUpdated', 'saveConfiguration'];
public function mount()
{
$this->redirect_url = $this->server->proxy->redirect_url;
}
public function serverValidated()
public function proxyStatusUpdated()
{
$this->server->refresh();
}
@@ -44,7 +43,7 @@ class Proxy extends Component
], $this->server);
$this->server->proxy->status = 'exited';
$this->server->save();
$this->server->refresh();
$this->emit('proxyStatusUpdated');
}
public function saveConfiguration()
{

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

@@ -11,7 +11,7 @@ class Deploy extends Component
{
public Server $server;
public $proxy_settings = null;
protected $listeners = ['proxyStatusUpdated', 'serverValidated' => 'proxyStatusUpdated'];
protected $listeners = ['proxyStatusUpdated'];
public function proxyStatusUpdated()
{
$this->server->refresh();

4
app/Http/Livewire/Server/Proxy/Status.php
View File

@@ -9,7 +9,7 @@ use Livewire\Component;
class Status extends Component
{
public Server $server;
protected $listeners = ['proxyStatusUpdated', 'serverValidated' => 'proxyStatusUpdated'];
protected $listeners = ['proxyStatusUpdated'];
public function proxyStatusUpdated()
{
$this->server->refresh();
@@ -17,7 +17,7 @@ class Status extends Component
public function proxyStatus()
{
try {
dispatch(new ProxyContainerStatusJob(
dispatch_sync(new ProxyContainerStatusJob(
server: $this->server
));
$this->emit('proxyStatusUpdated');

7
app/Http/Livewire/Settings/Configuration.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Livewire\Settings;
use App\Actions\Proxy\InstallProxy;
use App\Jobs\ProxyCheckJob;
use App\Models\InstanceSettings as ModelsInstanceSettings;
use App\Models\Server;
use Illuminate\Support\Facades\Http;
use Livewire\Component;
use Spatie\Url\Url;
use Symfony\Component\Yaml\Yaml;
@@ -108,6 +108,7 @@ class Configuration extends Component
];
}
$this->save_configuration_to_disk($traefik_dynamic_conf, $file);
dispatch(new ProxyCheckJob($this->server));
}
}
private function save_configuration_to_disk(array $traefik_dynamic_conf, string $file)
@@ -137,12 +138,8 @@ class Configuration extends Component
}
$this->validate();
$this->settings->save();
$this->server = Server::findOrFail(0);
$this->setup_instance_fqdn();
if ($this->settings->fqdn) {
dispatch(new ProxyCheckJob());
}
$this->emit('success', 'Instance settings updated successfully!');
}
}