Merge pull request #98 from SparkartGroupInc/96-reload-preprocessors-in-dev

reload workers when preprocessors change

Author: takempf

lib/preprocessor.js

@@ -7,12 +7,8 @@ var EventEmitter = require('events').EventEmitter;
 
 var _ = require('underscore');
 var workerFarm = require('worker-farm');
-var workers = workerFarm({
-	maxCallsPerWorker: 100,
-	maxConcurrentWorkers: 4,
-	maxConcurrentCallsPerWorker: -1,
-	maxCallTime: 1000
-}, require.resolve('./preprocessor_worker.js'));
+
+var workers;
 
 var Preprocessor = function( preprocessor_path, options ){
 
@@ -48,21 +44,27 @@ var Preprocessor = function( preprocessor_path, options ){
 
 	};
 
-	// update the source of the preprocessor
-	this.updateSource = function( callback ){
-
-		delete require.cache[this.path];
-		callback();
+};
 
-	};
+// properly inherit from EventEmitter part 2
+util.inherits( Preprocessor, EventEmitter );
 
-	this.updateSource( function(){
-		preprocessor.emit( 'ready' );
-	});
+Preprocessor.setWorkers = function(){
+	workers = workerFarm({
+		maxCallsPerWorker: 100,
+		maxConcurrentWorkers: 4,
+		maxConcurrentCallsPerWorker: -1,
+		maxCallTime: 1000
+	}, require.resolve('./preprocessor_worker.js'));
+};
 
+// destroy and re-initialize worker farm
+// this is used to update preprocessor modules in development
+Preprocessor.resetWorkers = function(){
+	workerFarm.end( workers );
+	Preprocessor.setWorkers();
 };
 
-// properly inherit from EventEmitter part 2
-util.inherits( Preprocessor, EventEmitter );
+Preprocessor.setWorkers();
 
 module.exports = Preprocessor;

lib/server.js

@@ -239,8 +239,7 @@ var SolidusServer = function( options ){
 	// updates the source of a preprocessor
 	this.updatePreprocessor = function( preprocessor_path ){
 
-		var path_to = path.relative( paths.preprocessors, preprocessor_path );
-		preprocessors[path_to].updateSource();
+		Preprocessor.resetWorkers();
 
 	};