Merge pull request #71 from JarvusInnovations/develop

Release: emergence v1.1.4
JarvusInnovations · Oct 22, 2019 · bb52ba7 · bb52ba7
2 parents 76abe21 + 33aef4b
commit bb52ba7
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/bin/fire-event b/bin/fire-event
@@ -15,14 +15,23 @@ require('yargs')
             })
     }, argv => {
         var path = require('path'),
+            kernelConfig = require('/emergence/config.json'),
+            socketPath = kernelConfig.services.plugins.php.socketPath || '/emergence/services/run/php-fpm/php-fpm.sock',
+            socketHostMatch = socketPath.match(/^(?<host>[^\/:]+):(?<port>\d+)$/),
             documentRoot = path.resolve(__dirname, '../php-bootstrap'),
             PHPFPM = require('node-phpfpm'),
-            phpClient = new PHPFPM({
-                sockFile: '/emergence/services/run/php-fpm/php-fpm.sock',
+            phpClientConfig = {
                 documentRoot: documentRoot + '/'
-            }),
+            },
             payload = Object.assign({}, argv);
 
+        if (socketHostMatch) {
+            phpClientConfig.host = socketHostMatch.groups.host;
+            phpClientConfig.port = socketHostMatch.groups.port;
+        } else {
+            phpClientConfig.sockFile = socketPath;
+        }
+
         delete payload._;
         delete payload.help;
         delete payload.version;
@@ -32,7 +41,7 @@ require('yargs')
         delete payload['$0'];
 
         // execute event via PHP-FPM interface
-        phpClient.run({
+        new PHPFPM(phpClientConfig).run({
             uri: 'event.php',
             json: {
                 site: argv.site,