Merge pull request #43 from 2gis/fix-gulp-runtime-crash

fix crush on runtime
2gis · Sep 11, 2014 · 0b326bf · 0b326bf
2 parents 95da888 + ccc2d29
commit 0b326bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -3,7 +3,6 @@ var express = require('express'),
     cluster = require('cluster'),
     cpuCount = require('os').cpus().length,
     clc = require('cli-color'),
-    gulp = require(__dirname + '/gulpfile.js'),
     config = require(__dirname + '/build/config.js').appConfig;
 
 //Init application
@@ -42,6 +41,9 @@ function getParams(req, resp, next) {
     next();
 }
 
+process.env.isRuntime = true;
+var gulp = require(__dirname + '/gulpfile.js');
+
 app.get('/js', getParams, function (req, res) {
     var jsStream = gulp.getJS(req.query);
     req.dgCallback(jsStream, res);

diff --git a/gulpfile.js b/gulpfile.js
@@ -22,7 +22,9 @@ var extend = require('extend'),
 $.imagemin = require('./build/gulp-imagemin');
 $.spritesmith = require('gulp.spritesmith');
 
-require('./build/fixFileCache')($.cache.fileCache, './build/tmp'); // fix file cache due to buggy realization
+if (!process.env.isRuntime) {
+    require('./build/fixFileCache')($.cache.fileCache, './build/tmp'); // fix file cache due to buggy realization
+}
 
 var projectList,
     errorNotify = function(e) {