Changeset 519 for Dev/trunk/src/server/bin

Timestamp:

03/15/14 01:00:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Support different environments with QED_ENV. If dev, run against qed-dev database, if production, run against qed database. The UI indicates if we are running in anything but production mode.
• Return undefined if we allow page leaves, because null is treated as a value.
• Changed format of design docs, so it can work for different databases.
• Use correct design documents in configCouch, so server now actually updates them when it starts.

Location:

Dev/trunk/src/server/bin

Files:

• check-db.js (modified) (1 diff)
• config-db-for-upgrade.js (modified) (1 diff)
• config-db.js (modified) (1 diff)
• heroku.js (modified) (1 diff)

Dev/trunk/src/server/bin/check-db.js

@@ -2 +2 @@
   , checkCouch = require('../config/check-couchdb')
   ;
+console.log("Running on",env.couchServerURL+env.dbName);
 checkCouch(env.couchServerURL,env.dbName)
 .then(function(res){

Dev/trunk/src/server/bin/config-db-for-upgrade.js

@@ -3 +3 @@
   , designDocs = require('../config/couchdb-upgrade-design-docs')
   ;
+console.log("Running on",env.couchServerURL+env.dbName);
 configCouch(env.couchServerURL,env.dbName,designDocs)
 .then(function(res){

Dev/trunk/src/server/bin/config-db.js

@@ -3 +3 @@
   , designDocs = require('../config/couchdb-design-docs')
   ;
+console.log("Running on",env.couchServerURL+env.dbName);
 configCouch(env.couchServerURL,env.dbName,designDocs)
 .then(function(res){

Dev/trunk/src/server/bin/heroku.js

@@ -1 +1 @@
 var env = require('../env')
   , configCouch = require('../config/config-couchdb')
-  , designDocs = require('../config/config-couchdb')
+  , designDocs = require('../config/couchdb-design-docs')
   ;
 
-console.log("Running on",env.couchServerURL);
+console.log("Running on",env.couchServerURL+env.dbName);
 
-require('../app').App({
-    couchServerURL: env.couchServerURL,
-    dbName: env.dbName
-}).then(function(app){
+require('../app').App(env)
+.then(function(app){
     configCouch(env.couchServerURL,env.dbName,designDocs);
     return app;