Jobs runner

bin/fire-event

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+
+
+require('yargs')
+    .command('$0 <site> <event> <context>', 'Fire event within site', yargs => {
+        yargs
+            .positional('site', {
+                describe: 'Handle of site to fire event within'
+            })
+            .positional('event', {
+                describe: 'Name of event to fire'
+            })
+            .positional('context', {
+                describe: 'Context path to fire event within'
+            })
+    }, argv => {
+        var path = require('path'),
+            documentRoot = path.resolve(__dirname, '../php-bootstrap'),
+            PHPFPM = require('node-phpfpm'),
+            phpClient = new PHPFPM({
+                sockFile: '/emergence/services/run/php-fpm/php-fpm.sock',
+                documentRoot: documentRoot + '/'
+            }),
+            payload = Object.assign({}, argv);
+
+        delete payload._;
+        delete payload.help;
+        delete payload.version;
+        delete payload.site;
+        delete payload.event;
+        delete payload.context;
+        delete payload['$0'];
+
+        // execute event via PHP-FPM interface
+        phpClient.run({
+            uri: 'event.php',
+            json: {
+                site: argv.site,
+                event: argv.event,
+                context: argv.context,
+                payload: payload
+            }
+        }, function (err, output, phpErrors) {
+            if (err == 99) console.error('PHPFPM server error');
+            console.log(output);
+            if (phpErrors) console.error(phpErrors);
+        });
+
+    })
+    .argv;

bin/kernel

@@ -158,6 +158,7 @@ var eServices = require('../kernel-lib/services.js').createServices(eSites, CONF
 // instantiate management server
 var eManagementServer = require('../kernel-lib/server.js').createServer({
     sites: eSites,
+    jobs: eSites.handleJobsRequest.bind(eSites),
     services: eServices
 }, CONFIG);
 

kernel-lib/server.js

@@ -107,7 +107,8 @@ exports.Server.prototype.handleRequest = function(request, response) {
         }
 
         if (me.paths.hasOwnProperty(request.path[0])) {
-            var result = me.paths[request.path[0]].handleRequest(request, response, me);
+            var handler = me.paths[request.path[0]];
+            var result = (typeof handler == 'function' ? handler(request, response, me) : handler.handleRequest(request, response, me));
 
             if (result===false)  {
                 response.writeHead(404);

kernel-lib/services/mysql.js

@@ -220,12 +220,13 @@ exports.MysqlService.prototype.makeConfig = function() {
         'datadir                            = '+me.options.dataDir,
         'skip-external-locking',
         'key_buffer_size                    = 16M',
-        'max_allowed_packet                 = 1M',
+        'max_allowed_packet                 = 512M',
         'sort_buffer_size                   = 512K',
         'net_buffer_length                  = 8K',
         'read_buffer_size                   = 256K',
         'read_rnd_buffer_size               = 512K',
         'myisam_sort_buffer_size            = 8M',
+        'explicit_defaults_for_timestamp    = 1',
 //      'lc-messages-dir                    = /usr/local/share/mysql',
 
         'log-bin                            = mysqld-bin',

kernel-lib/services/nginx.js

@@ -178,7 +178,8 @@ exports.NginxService.prototype.makeConfig = function() {
         'user '+me.options.user+' '+me.options.group+';',
         'worker_processes auto;',
         'pid '+me.options.pidPath+';',
-        'error_log '+me.options.errorLogPath+' info;'
+        'error_log '+me.options.errorLogPath+' info;',
+        'worker_rlimit_nofile 100000;'
     );
 
 
@@ -256,15 +257,15 @@ exports.NginxService.prototype.makeConfig = function() {
     );
 
     _.each(me.controller.sites.sites, function(site, handle) {
-        var hostnames = site.hostnames.slice(),
+        var hostnames = site.config.hostnames.slice(),
             siteDir = me.controller.sites.options.sitesDir+'/'+handle,
             logsDir = siteDir+'/logs',
             siteConfig = [],
             sslHostnames, sslHostname;
 
         // process hostnames
-        if (_.indexOf(hostnames, site.primary_hostname) == -1) {
-            hostnames.unshift(site.primary_hostname);
+        if (_.indexOf(hostnames, site.config.primary_hostname) == -1) {
+            hostnames.unshift(site.config.primary_hostname);
         }
 
         // process directories
@@ -301,15 +302,15 @@ exports.NginxService.prototype.makeConfig = function() {
             '    }'
         );
 
-        if (site.ssl) {
-            if (site.ssl.hostnames) {
-                sslHostnames = site.ssl.hostnames;
+        if (site.config.ssl) {
+            if (site.config.ssl.hostnames) {
+                sslHostnames = site.config.ssl.hostnames;
             } else {
                 sslHostnames = {};
-                sslHostnames[site.primary_hostname] = site.ssl;
+                sslHostnames[site.config.primary_hostname] = site.config.ssl;
 
-                site.hostnames.forEach(function(hostname) {
-                    sslHostnames[hostname] = site.ssl;
+                site.config.hostnames.forEach(function(hostname) {
+                    sslHostnames[hostname] = site.config.ssl;
                 });
             }
 

kernel-lib/services/php-fpm.js

@@ -3,7 +3,9 @@ var _ = require('underscore'),
     path = require('path'),
     util = require('util'),
     spawn = require('child_process').spawn,
-    phpfpm = require('node-phpfpm');
+    phpfpm = require('node-phpfpm'),
+    async = require('async'),
+    jobQueue;
 
 exports.createService = function(name, controller, options) {
     return new exports.PhpFpmService(name, controller, options);
@@ -44,8 +46,8 @@ exports.PhpFpmService = function(name, controller, options) {
         me.status = 'online';
     }
 
-    // listen for site updated
-    controller.sites.on('siteUpdated', _.bind(me.onSiteUpdated, me));
+    // listen for job requests
+    controller.sites.on('jobRequested', _.bind(me.onJobRequested, me));
 };
 
 util.inherits(exports.PhpFpmService, require('./abstract.js').AbstractService);
@@ -197,28 +199,62 @@ exports.PhpFpmService.prototype.makeConfig = function() {
     return config.join('\n');
 };
 
-exports.PhpFpmService.prototype.onSiteUpdated = function(siteData) {
-    var me = this,
-        siteRoot = me.controller.sites.options.sitesDir + '/' + siteData.handle,
+jobQueue = async.queue(function(data, callback) {
+    var me = data.scope,
+        siteRoot = me.controller.sites.options.sitesDir + '/' + data.job.handle,
         phpClient;
 
-    console.log(me.name+': clearing config cache for '+siteRoot);
-
     // Connect to FPM worker pool
     phpClient = new phpfpm({
         sockFile: me.options.socketPath,
         documentRoot: me.options.bootstrapDir + '/'
     });
 
-    // Clear cached site.json
+    // Mark job as started
+    data.job.started = new Date().getTime();
+
+    // Run job request
     phpClient.run({
-        uri: 'cache.php',
-        json: [
-            { action: 'delete', key: siteRoot }
-        ]
-    }, function(err, output, phpErrors) {
-        if (err == 99) console.error('PHPFPM server error');
-        console.log(output);
-        if (phpErrors) console.error(phpErrors);
+        uri: 'job.php',
+        json: {
+            'job': data.job,
+            'handle': data.job.handle,
+            'siteRoot': siteRoot
+        }
+    }, function(err, output, stderr) {
+        if (err == 99) {
+            data.job.status = 'failed';
+            data.job.message = 'PHPFPM server error';
+            console.error(data.job.message);
+            return callback(err);
+        }
+        if (stderr) {
+            data.job.status = 'failed';
+            data.job.message = stderr;
+            console.error(stderr);
+            return callback(stderr);
+        }
+
+        // Parse job response
+        try {
+            var response = JSON.parse(output);
+
+            // Update job with response
+            data.job.command = response.command;
+            data.job.status = 'completed';
+            data.job.completed = new Date().getTime();
+
+        } catch(e) {
+            data.job.status = 'failed';
+            data.job.message = 'PHPFPM server error';
+            console.error(output);
+            return callback(output);
+        }
+
+        callback(null, data.job);
     });
-};
+}, 5);
+
+exports.PhpFpmService.prototype.onJobRequested = function(job) {
+    jobQueue.push({'job': job, 'scope': this});
+}