Use Environment variable to determine production environment

beeman · beeman · commit 94ec7d07d0aa · 2015-01-16T17:08:19.000+07:00
diff --git a/server/server.js b/server/server.js
@@ -35,9 +35,9 @@ app.use(loopback.compress());
 // -- Add your pre-processing middleware here --
 
 var ds = loopback.createDataSource({
-    connector: require('loopback-component-storage'),
-    provider: 'filesystem',
-    root: path.join(__dirname, '../', 'storage')
+  connector: require('loopback-component-storage'),
+  provider: 'filesystem',
+  root: path.join(__dirname, '../', 'storage')
 });
 var container = ds.createModel('container');
 
@@ -70,7 +70,7 @@ app.use(loopback.session({
 var config = {};
 try {
   config = require('../providers.json');
-} catch(err) {
+} catch (err) {
   console.error('Please configure your passport strategy in `providers.json`.');
   console.error('Copy `providers.json.template` to `providers.json` and replace the clientID/clientSecret values with your own.');
   process.exit(1);
@@ -85,7 +85,7 @@ passportConfigurator.setupModels({
   userCredentialModel: app.models.userCredential
 });
 // Configure passport strategies for third party auth providers
-for(var s in config) {
+for (var s in config) {
   var c = config[s];
   c.session = c.session !== false;
   passportConfigurator.configureProvider(s, c);
@@ -117,21 +117,18 @@ app.get('/auth/logout', function (req, res, next) {
 // All static middleware should be registered at the end, as all requests
 // passing the static middleware are hitting the file system
 // Example:
-//app.use(loopback.static(path.resolve(__dirname, '../client/app')));
 
-var dist = false;
+var staticPath = null;
 
-var Static = null;
-
-if (argv['dist'] === true) {
-  Static = path.resolve(__dirname, '../dist/');
+if (process.env.NODE_ENV === 'production') {
+  staticPath = path.resolve(__dirname, '../dist/');
 }
 else {
-  Static = path.resolve(__dirname, '../client/app');
+  staticPath = path.resolve(__dirname, '../client/app');
 }
 
-console.log("Static", Static);
-app.use(loopback.static(Static));
+console.log("staticPath", staticPath);
+app.use(loopback.static(staticPath));
 
 // Requests that get this far won't be handled
 // by any middleware. Convert them into a 404 error
@@ -141,9 +138,9 @@ app.use(loopback.urlNotFound());
 // The ultimate error handler.
 app.use(loopback.errorHandler());
 
-app.start = function() {
+app.start = function () {
   // start the web server
-  return app.listen(function() {
+  return app.listen(function () {
     app.emit('started');
     console.log('Web server listening at: %s', app.get('url'));
   });
