Merge branch 'dev' of github.com:mapbox/tilestream into dev

cutting-room-floor · Jun 2, 2011 · dd6bcc0 · dd6bcc0
2 parents ce5573a + e0b2a3f
commit dd6bcc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/bootstrap.js b/lib/bootstrap.js
@@ -1,5 +1,4 @@
-var util = require('util'),
-    env = process.env.NODE_ENV || 'development';
+var util = require('util');
 
 // Application bootstrap. Ensures that tiles directory exists at server start.
 module.exports = function(settings, callback) {

diff --git a/servers/Route.bones b/servers/Route.bones
@@ -1,5 +1,3 @@
-var env = process.env.NODE_ENV || 'development';
-
 servers['Route'].augment({
     assets: {
         styles: [
@@ -13,13 +11,11 @@ servers['Route'].augment({
         ]
     },
     initializeAssets: function(parent, app) {
-        var maxAge = env == 'production' ? 3600 : 0;
-
         parent.call(this, app);
         this.get('/assets/tilestream/css/vendor.css',
-            mirror.assets(this.assets.styles, { type: '.css', maxAge: maxAge }));
+            new mirror(this.assets.styles, { type: '.css' }));
         this.get('/assets/tilestream/js/vendor.js',
-            mirror.assets(this.assets.scripts, { type: '.js', maxAge: maxAge }));
+            new mirror(this.assets.scripts, { type: '.js' }));
     },
     initializeModels: function(parent, app) {
         this.models = app.models;