fix sync status code error

cnpm · Apr 9, 2014 · 3646c2c · 3646c2c
1 parent fa44097
commit 3646c2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/index.js b/config/index.js
@@ -109,7 +109,7 @@ var config = {
 // load config/config.js, everything in config.js will cover the same key in index.js
 var customConfig = path.join(root, 'config/config.js');
 if (fs.existsSync(customConfig)) {
-  copy(require(customConfig)).toCover(config);
+  copy(require(customConfig)).override(config);
 }
 
 mkdirp.sync(config.logdir);
@@ -121,5 +121,5 @@ config.loadConfig = function (customConfig) {
   if (!customConfig) {
     return;
   }
-  copy(customConfig).toCover(config);
+  copy(customConfig).override(config);
 };
diff --git a/controllers/sync.js b/controllers/sync.js
@@ -39,7 +39,7 @@ exports.sync = function *() {
   var result = yield SyncModuleWorker.sync(name, username, options);
 
   // friendly 404 reason info
-  if (result.staticCache === 404) {
+  if (result.statusCode === 404) {
     this.status = 404;
     this.body = {
       ok: false,
@@ -48,7 +48,7 @@ exports.sync = function *() {
     return;
   }
   if (!result.ok) {
-    this.status = result.statusCode;
+    this.status = result.statusCode || 500;
     this.body = result.pkg;
     return;
   }