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

put a few things on high queue

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-06 12:33:56 +01:00
parent 0aa2ba6923
commit 275edb6c1f
13 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ class StartDatabase
break; break;
} }
if ($database->is_public && $database->public_port) { if ($database->is_public && $database->public_port) {
StartDatabaseProxy::dispatch($database); StartDatabaseProxy::dispatch($database)->onQueue('high');
} }
return $activity; return $activity;

2
app/Actions/Server/InstallDocker.php
View File

@@ -12,11 +12,11 @@ class InstallDocker
public function handle(Server $server) public function handle(Server $server)
{ {
$dockerVersion = config('constants.docker_install_version');
$supported_os_type = $server->validateOS(); $supported_os_type = $server->validateOS();
if (! $supported_os_type) { if (! $supported_os_type) {
throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.'); throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
} }
$dockerVersion = '26.0';
$config = base64_encode('{ $config = base64_encode('{
"log-driver": "json-file", "log-driver": "json-file",
"log-opts": { "log-opts": {

4
app/Actions/Server/ServerCheck.php
View File

@@ -130,10 +130,10 @@ class ServerCheck
if ($foundLogDrainContainer) { if ($foundLogDrainContainer) {
$status = data_get($foundLogDrainContainer, 'State.Status'); $status = data_get($foundLogDrainContainer, 'State.Status');
if ($status !== 'running') { if ($status !== 'running') {
StartLogDrain::dispatch($this->server); StartLogDrain::dispatch($this->server)->onQueue('high');
} }
} else { } else {
StartLogDrain::dispatch($this->server); StartLogDrain::dispatch($this->server)->onQueue('high');
} }
} }

2
app/Console/Commands/Init.php
View File

@@ -88,7 +88,7 @@ class Init extends Command
$server->settings->update(['is_metrics_enabled' => false]); $server->settings->update(['is_metrics_enabled' => false]);
} }
if ($server->isFunctional()) { if ($server->isFunctional()) {
StopSentinel::dispatch($server); StopSentinel::dispatch($server)->onQueue('high');
} }
} }
} }

6
app/Console/Commands/ServicesDelete.php
View File

@@ -96,7 +96,7 @@ class ServicesDelete extends Command
if (! $confirmed) { if (! $confirmed) {
break; break;
} }
DeleteResourceJob::dispatch($toDelete); DeleteResourceJob::dispatch($toDelete)->onQueue('high');
} }
} }
} }
@@ -122,7 +122,7 @@ class ServicesDelete extends Command
if (! $confirmed) { if (! $confirmed) {
return; return;
} }
DeleteResourceJob::dispatch($toDelete); DeleteResourceJob::dispatch($toDelete)->onQueue('high');
} }
} }
} }
@@ -148,7 +148,7 @@ class ServicesDelete extends Command
if (! $confirmed) { if (! $confirmed) {
return; return;
} }
DeleteResourceJob::dispatch($toDelete); DeleteResourceJob::dispatch($toDelete)->onQueue('high');
} }
} }
} }

4
app/Http/Controllers/Api/ApplicationsController.php
View File

@@ -1358,7 +1358,7 @@ class ApplicationsController extends Controller
deleteVolumes: $request->query->get('delete_volumes', true), deleteVolumes: $request->query->get('delete_volumes', true),
dockerCleanup: $request->query->get('docker_cleanup', true), dockerCleanup: $request->query->get('docker_cleanup', true),
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true) deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
); )->onQueue('high');
return response()->json([ return response()->json([
'message' => 'Application deletion request queued.', 'message' => 'Application deletion request queued.',
@@ -2482,7 +2482,7 @@ class ApplicationsController extends Controller
if (! $application) { if (! $application) {
return response()->json(['message' => 'Application not found.'], 404); return response()->json(['message' => 'Application not found.'], 404);
} }
StopApplication::dispatch($application); StopApplication::dispatch($application)->onQueue('high');
return response()->json( return response()->json(
[ [

8
app/Http/Controllers/Api/DatabasesController.php
View File

@@ -497,9 +497,9 @@ class DatabasesController extends Controller
$database->update($request->all()); $database->update($request->all());
if ($whatToDoWithDatabaseProxy === 'start') { if ($whatToDoWithDatabaseProxy === 'start') {
StartDatabaseProxy::dispatch($database); StartDatabaseProxy::dispatch($database)->onQueue('high');
} elseif ($whatToDoWithDatabaseProxy === 'stop') { } elseif ($whatToDoWithDatabaseProxy === 'stop') {
StopDatabaseProxy::dispatch($database); StopDatabaseProxy::dispatch($database)->onQueue('high');
} }
return response()->json([ return response()->json([
@@ -1593,7 +1593,7 @@ class DatabasesController extends Controller
deleteVolumes: $request->query->get('delete_volumes', true), deleteVolumes: $request->query->get('delete_volumes', true),
dockerCleanup: $request->query->get('docker_cleanup', true), dockerCleanup: $request->query->get('docker_cleanup', true),
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true) deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
); )->onQueue('high');
return response()->json([ return response()->json([
'message' => 'Database deletion request queued.', 'message' => 'Database deletion request queued.',
@@ -1742,7 +1742,7 @@ class DatabasesController extends Controller
if (str($database->status)->contains('stopped') || str($database->status)->contains('exited')) { if (str($database->status)->contains('stopped') || str($database->status)->contains('exited')) {
return response()->json(['message' => 'Database is already stopped.'], 400); return response()->json(['message' => 'Database is already stopped.'], 400);
} }
StopDatabase::dispatch($database); StopDatabase::dispatch($database)->onQueue('high');
return response()->json( return response()->json(
[ [

6
app/Http/Controllers/Api/ServersController.php
View File

@@ -538,7 +538,7 @@ class ServersController extends Controller
'is_build_server' => $request->is_build_server, 'is_build_server' => $request->is_build_server,
]); ]);
if ($request->instant_validate) { if ($request->instant_validate) {
ValidateServer::dispatch($server); ValidateServer::dispatch($server)->onQueue('high');
} }
return response()->json([ return response()->json([
@@ -651,7 +651,7 @@ class ServersController extends Controller
]); ]);
} }
if ($request->instant_validate) { if ($request->instant_validate) {
ValidateServer::dispatch($server); ValidateServer::dispatch($server)->onQueue('high');
} }
return response()->json(serializeApiResponse($server))->setStatusCode(201); return response()->json(serializeApiResponse($server))->setStatusCode(201);
@@ -787,7 +787,7 @@ class ServersController extends Controller
if (! $server) { if (! $server) {
return response()->json(['message' => 'Server not found.'], 404); return response()->json(['message' => 'Server not found.'], 404);
} }
ValidateServer::dispatch($server); ValidateServer::dispatch($server)->onQueue('high');
return response()->json(['message' => 'Validation started.']); return response()->json(['message' => 'Validation started.']);
} }

4
app/Http/Controllers/Api/ServicesController.php
View File

@@ -487,7 +487,7 @@ class ServicesController extends Controller
deleteVolumes: $request->query->get('delete_volumes', true), deleteVolumes: $request->query->get('delete_volumes', true),
dockerCleanup: $request->query->get('docker_cleanup', true), dockerCleanup: $request->query->get('docker_cleanup', true),
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true) deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
); )->onQueue('high');
return response()->json([ return response()->json([
'message' => 'Service deletion request queued.', 'message' => 'Service deletion request queued.',
@@ -1154,7 +1154,7 @@ class ServicesController extends Controller
if (str($service->status())->contains('stopped') || str($service->status())->contains('exited')) { if (str($service->status())->contains('stopped') || str($service->status())->contains('exited')) {
return response()->json(['message' => 'Service is already stopped.'], 400); return response()->json(['message' => 'Service is already stopped.'], 400);
} }
StopService::dispatch($service); StopService::dispatch($service)->onQueue('high');
return response()->json( return response()->json(
[ [

2
app/Jobs/PushServerUpdateJob.php
View File

@@ -360,7 +360,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
private function checkLogDrainContainer() private function checkLogDrainContainer()
{ {
if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) { if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
StartLogDrain::dispatch($this->server); StartLogDrain::dispatch($this->server)->onQueue('high');
} }
} }
} }

4
app/Jobs/ServerCheckJob.php
View File

@@ -94,10 +94,10 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
if ($foundLogDrainContainer) { if ($foundLogDrainContainer) {
$status = data_get($foundLogDrainContainer, 'State.Status'); $status = data_get($foundLogDrainContainer, 'State.Status');
if ($status !== 'running') { if ($status !== 'running') {
StartLogDrain::dispatch($this->server); StartLogDrain::dispatch($this->server)->onQueue('high');
} }
} else { } else {
StartLogDrain::dispatch($this->server); StartLogDrain::dispatch($this->server)->onQueue('high');
} }
} }
} }

1
config/constants.php
View File

@@ -1,6 +1,7 @@
<?php <?php
return [ return [
'docker_install_version' => '26.0',
'docs' => [ 'docs' => [
'base_url' => 'https://coolify.io/docs', 'base_url' => 'https://coolify.io/docs',
'contact' => 'https://coolify.io/docs/contact', 'contact' => 'https://coolify.io/docs/contact',

20
other/nightly/install.sh
View File

@@ -5,7 +5,7 @@ set -e # Exit immediately if a command exits with a non-zero status
## $1 could be empty, so we need to disable this check ## $1 could be empty, so we need to disable this check
#set -u # Treat unset variables as an error and exit #set -u # Treat unset variables as an error and exit
set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
CDN="https://cdn.coollabs.io/coolify-nightly" CDN="https://cdn.coollabs.io/coolify"
DATE=$(date +"%Y%m%d-%H%M%S") DATE=$(date +"%Y%m%d-%H%M%S")
VERSION="1.6" VERSION="1.6"
@@ -13,7 +13,7 @@ DOCKER_VERSION="26.0"
# TODO: Ask for a user # TODO: Ask for a user
CURRENT_USER=$USER CURRENT_USER=$USER
mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,metrics,logs} mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,sentinel}
mkdir -p /data/coolify/ssh/{keys,mux} mkdir -p /data/coolify/ssh/{keys,mux}
mkdir -p /data/coolify/proxy/dynamic mkdir -p /data/coolify/proxy/dynamic
@@ -164,7 +164,6 @@ sles | opensuse-leap | opensuse-tumbleweed)
esac esac
echo -e "2. Check OpenSSH server configuration. " echo -e "2. Check OpenSSH server configuration. "
# Detect OpenSSH server # Detect OpenSSH server
@@ -262,9 +261,14 @@ if ! [ -x "$(command -v docker)" ]; then
fi fi
;; ;;
*) *)
curl -s https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh >/dev/null 2>&1 if [ "$OS_TYPE" = "ubuntu" ] && [ "$OS_VERSION" = "24.10" ]; then
echo "Docker automated installation is not supported on Ubuntu 24.10 (non-LTS release)."
echo "Please install Docker manually."
exit 1
fi
curl -s https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh 2>&1
if ! [ -x "$(command -v docker)" ]; then if ! [ -x "$(command -v docker)" ]; then
curl -s https://get.docker.com | sh -s -- --version ${DOCKER_VERSION} >/dev/null 2>&1 curl -s https://get.docker.com | sh -s -- --version ${DOCKER_VERSION} 2>&1
if ! [ -x "$(command -v docker)" ]; then if ! [ -x "$(command -v docker)" ]; then
echo " - Docker installation failed." echo " - Docker installation failed."
echo " Maybe your OS is not supported?" echo " Maybe your OS is not supported?"
@@ -404,10 +408,10 @@ if [ ! -f ~/.ssh/authorized_keys ]; then
fi fi
set +e set +e
IF_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) IS_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l)
set -e set -e
if [ "$IF_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then if [ "$IS_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then
echo " - Generating SSH key." echo " - Generating SSH key."
ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify
chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal
@@ -424,7 +428,7 @@ echo -e " - It could take a while based on your server's performance, network sp
echo -e " - Please wait." echo -e " - Please wait."
getAJoke getAJoke
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1 bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
echo " - Coolify installed successfully." echo " - Coolify installed successfully."
rm -f $ENV_FILE-$DATE rm -f $ENV_FILE-$DATE