wip #5418 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index c1194384268cc637a1ec760fdf70d9d6b75d6c1c..62b8bf577ec0cc1ffe0fa4a3ada5d234ec9780e8 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -22,7 +22,8 @@ services:
         build: /data1/extranet/toolbox/.docker/images/php
         working_dir: /application
         volumes:
-            - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/'
+            - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/:ro'
+            - '/data1/extranet/toolbox/.docker/config/ssh/:/application/.ssh/:ro'
             - '/data1/extranet/toolbox/.docker/config/supervisor/:/etc/supervisor/conf.d/'
             - '/data1/extranet/toolbox/.docker/config/composer/:/root/.config/composer/'
             - '/data1/extranet/toolbox/.docker/config/npm/:/root/.npm/'

diff --git a/.docker/images/php/overrides.conf b/.docker/images/php/overrides.conf
index 5d60f05fb1280ebd3cd13b4064348071498b1c0e..9c98459b342ed394ee52b96961d18d756a9787a5 100644 (file)
--- a/.docker/images/php/overrides.conf
+++ b/.docker/images/php/overrides.conf
@@ -17,7 +17,7 @@ daemonize = no
 listen = [::]:9000
 
 ; Redirect logs to stdout - FPM closes /dev/std* on startup
-access.log = /proc/self/fd/2
+access.log = /proc/self/fd/1
 catch_workers_output = yes
 
 ; Remove "pool www" decoration from log output (older phpdocker.io containers for php use sed for this)

diff --git a/app/Util/FluidbookFarm.php b/app/Util/FluidbookFarm.php
index 707e6ae16afbbc9c988130fd297b10400565c0b9..d922062d0b4755133df7464997cf7d8c5109f35d 100644 (file)
--- a/app/Util/FluidbookFarm.php
+++ b/app/Util/FluidbookFarm.php
@@ -7,6 +7,8 @@ use Cubist\Util\Files\Files;
 
 class FluidbookFarm
 {
+    const KEY = '/application/.ssh/id_rsa';
+
     protected static $_farmServers = [
         ['name' => 'elephantman', 'host' => 'elephantman.cubedesigners.com', 'port' => 22822, 'weight' => 1],
         ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'port' => 22822, 'weight' => 1],
@@ -74,11 +76,9 @@ class FluidbookFarm
         }
 
         $time = round(microtime(true) - $start, 4);
-        $log = '[' . $farmer['name'] . ']' . "\t" . date('Y-m-d H:i:s') . "\t\t\t\t" . $time . "\t\t\t\t$page|$format|$resolution|$withText|$withGraphics|$version\t\t\t\t$res\t\t\t\t" . $cl->getOutput() . "\n";
+        $log = '[' . $farmer['name'] . ']' . "\t" . date('Y-m-d H:i:s') . "\t" . $time . "\t$page|$format|$resolution|$withText|$withGraphics|$version\t$res\t" . $cl->getOutput() . "\n";
 
-        $fp = fopen($path . '/farm.log', 'a+');
-        fwrite($fp, $log);
-        fclose($fp);
+        error_log($log);
 
         return $res;
     }
@@ -112,7 +112,7 @@ class FluidbookFarm
             }
 
             $cl = new CommandLine('/usr/local/fluidbook_processfarm/bin/ping');
-            $cl->setSSH($farmer['host'], 'fluidbookfarmer', '', $farmer['port'] ?? 22, '/home/extranet/.ssh/id_rsa');
+            $cl->setSSH($farmer['host'], 'fluidbookfarmer', '', $farmer['port'] ?? 22, self::KEY);
             $cl->execute();
             $ok = trim($cl->output) == '1';
             if ($echo) {
@@ -130,7 +130,7 @@ class FluidbookFarm
         foreach (self::getServers() as $id => $farmer) {
             echo $farmer['host'] . ' (' . $id . ')' . "\n";
             $cl = new CommandLine('sudo /usr/local/fluidbook_processfarm/bin/update');
-            $cl->setSSH($farmer['host'], 'fluidbookfarmer', '', $farmer['port'] ?? 22, '/home/extranet/.ssh/id_rsa');
+            $cl->setSSH($farmer['host'], 'fluidbookfarmer', '', $farmer['port'] ?? 22, self::KEY);
             $cl->execute();
             echo $cl->getCommand() . "\n\n--\n\n" . $cl->getOutput() . "\n\n";
         }