try #7435 @0.5

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index e63eec057a309a8c7af8606f68f0bb6adb27332e..04ff1cd95c6fd09440636d5fda8f38e77738176c 100644 (file)
--- 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 6283d01ab8e40f64a5115e5a6481f4ccbe3b54a5..954a327222893fab19f3cdf9f8d565aaa27f1f41 100644 (file)
--- 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;