Changeset 470 for Dev/trunk/src/server/config

Timestamp:

07/01/13 03:11:23 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Reorganized app and fixed some style issues.

Was looking for a bug where the proxy would not forward requests to the
database. This is somehow magically resolved now.

File:

• Dev/trunk/src/server/config/config-couchdb.js (modified) (1 diff)

Dev/trunk/src/server/config/config-couchdb.js

@@ -66 +66 @@
         designDocs = stringifyFunctions(designDocs);
         return q.all(_.map(designDocs, function(doc,docUrl){
-            var configAction = doc.__configAction;
+            var configAction = doc.__configAction || "replace";
             delete doc.__configAction;
             switch (configAction) {
-                case "ignore":
-                    console.log(docUrl+" ignored.");
+            case "ignore":
+                console.log(docUrl+" ignored.");
                 break;
-                case "update":
-                    console.log(docUrl+" updating.");
-                    return dbRequest('GET',docUrl)
-                    .then(function(oldDoc){
-                        _.extend(oldDoc,doc);
-                        return dbRequest('PUT',docUrl,oldDoc);
-                    },function(){
-                        return dbRequest('PUT',docUrl,doc);
-                    });
-                break;
-                case "replace":
-                default:
-                    console.log(docUrl+" replacing.");
-                    return dbRequest('GET',docUrl)
-                    .then(function(oldDoc){
-                        _.extend(doc,_.pick(oldDoc,'_id','_rev'));
-                        return dbRequest('PUT',docUrl,doc);
-                    },function(){
-                        return dbRequest('PUT',docUrl,doc);
-                    });
+            case "update":
+                console.log(docUrl+" updating.");
+                return dbRequest('GET',docUrl)
+                .then(function(oldDoc){
+                    _.extend(oldDoc,doc);
+                    return dbRequest('PUT',docUrl,oldDoc);
+                },function(){
+                    return dbRequest('PUT',docUrl,doc);
+                });
+            case "replace":
+                console.log(docUrl+" replacing.");
+                return dbRequest('GET',docUrl)
+                .then(function(oldDoc){
+                    _.extend(doc,_.pick(oldDoc,'_id','_rev'));
+                    return dbRequest('PUT',docUrl,doc);
+                },function(){
+                    return dbRequest('PUT',docUrl,doc);
+                });
+            default:
+                console.warn("Unknown action",configAction);
                 break;
             }