From ed23547fd3a88a6f7416c92b7ae9a80950a43fef Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 2 Apr 2025 18:34:52 +0200 Subject: [PATCH] try #7435 @0.5 --- app/Fluidbook/Compiler/Compiler.php | 2 +- app/Fluidbook/Packager/Download.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index e63eec057..04ff1cd95 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -722,7 +722,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError { $this->lock = \Illuminate\Support\Facades\Cache::lock('fluidbook_compile_' . $this->book_id, 1800); - if ($this->lock->block(1800)) { + if ($this->lock->block(300)) { try { if (!$this->compositionCached()) { $this->log('Preprocess images'); diff --git a/app/Fluidbook/Packager/Download.php b/app/Fluidbook/Packager/Download.php index 6283d01ab..954a32722 100644 --- a/app/Fluidbook/Packager/Download.php +++ b/app/Fluidbook/Packager/Download.php @@ -116,6 +116,7 @@ class Download extends DownloadBase } } } else if ($this->action === 'install') { + echo 'Install on ' . json_encode($this->entry->install_online) . "\n"; $s = $this->entry->install_online; $dest = Driver::cleanInstallDir($s['path']); /** @var FluidbookExternalInstallServer $server */ @@ -147,6 +148,7 @@ class Download extends DownloadBase if ($this->entry->hosting_loadbalancer) { Download::dispatch($this->entry, $this->version, 'loadbalancer', $this->user, $this->_params); } + } else if ($this->action === 'loadbalancer') { $path = $this->_compileandpackage(false); $dest = $this->entry->protected_path('fluidbookpublication/loadbalancer/' . $this->entry->id . '_' . $this->entry->hash . '/'); @@ -167,6 +169,9 @@ class Download extends DownloadBase // } if ($notify) { + echo 'Send notification : ' . $subject . "\n"; + echo $text . "\n"; + echo json_encode($actions) . "\n"; $this->sendNotification($subject, $text, $actions, $showTextIfNotEmail); } return $res; -- 2.39.5