Readapt BoosterManager to new config file format

pydio · Aug 29, 2016 · 8fcaf96 · 8fcaf96
1 parent e557517
commit 8fcaf96
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/core/src/plugins/core.mq/src/Booster/BoosterManager.php b/core/src/plugins/core.mq/src/Booster/BoosterManager.php
@@ -42,7 +42,8 @@ class BoosterManager
     private $pluginWorkDir;
     private $pluginCacheDir;
 
-    private $configFileName = "pydiocaddy";
+    private $configFileJson = "pydioconf";
+    private $configFileCaddy = "pydiocaddy";
     private $logFileName    = "pydio.out";
     private $pidFileName    = "caddy-pid";
 
@@ -112,6 +113,29 @@ public function tailLogs($offset = 0){
 
     }
 
+    /**
+     * @param array $params
+     * @param string $adminKeyString
+     * @return array
+     */
+    public function generatePydioBoosterJson($params, $adminKeyString){
+
+        list($tokenP, $tokenS) = explode(":", $adminKeyString);
+        return [
+            "scheduler" => [
+                "host"      => ApplicationState::detectServerURL(true),
+                "tokenP"    => $tokenP,
+                "tokenS"    => $tokenS,
+                "minutes"   => 2
+            ],
+            "nsq"       => [
+                "host"      => "0.0.0.0",
+                "port"      => intval($params["NSQ_PORT"])
+            ]
+        ];
+
+    }
+
     /**
      * @param $params
      * @param string
@@ -227,22 +251,27 @@ public function generatePydioBoosterFile($params, $adminKeyString) {
         return $data;
     }
 
+
+
     /**
      * @param array $params
      * @param string $adminKeyString
      * @return string
      * @throws \Exception
      */
     public function savePydioBoosterFile($params, $adminKeyString) {
-        $data = $this->generatePydioBoosterFile($params, $adminKeyString);
 
         $wDir = $this->pluginWorkDir;
-        $caddyFile = $wDir.DIRECTORY_SEPARATOR.$this->configFileName;
-
-        // Generate the caddyfile
+        $caddyFile = $wDir.DIRECTORY_SEPARATOR.$this->configFileCaddy;
+        $data = $this->generatePydioBoosterFile($params, $adminKeyString);
         file_put_contents($caddyFile, $data);
 
-        return $caddyFile;
+        $jsonFile = $wDir.DIRECTORY_SEPARATOR.$this->configFileJson;
+        $jsonData = $this->generatePydioBoosterJson($params, $adminKeyString);
+        $jsonData["caddyFilePath"] = $caddyFile;
+        file_put_contents($jsonFile, json_encode($jsonData, JSON_PRETTY_PRINT));
+
+        return $jsonFile;
     }
 
     /**