RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #86 from matiu/feature/10sync

Browse Source 
Feature/10sync -- great!
This commit is contained in:
Gustavo Maximiliano Cortez 2014-01-20 05:30:26 -08:00
commit 441843a25f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/status.js
View File

@ -45,8 +45,7 @@ exports.show = function(req, res, next) {
} }
}; };
exports.sync = function(req, res, next) { exports.sync = function(req, res) {
if (req.syncInfo) if (req.syncInfo)
res.jsonp(req.syncInfo); res.jsonp(req.syncInfo);
next();
}; };

8
lib/HistoricSync.js
View File

@ -274,11 +274,13 @@ function spec() {
}); });
} }
if (!err) if (err) {
sync(); self.syncInfo = util._extend(self.syncInfo, { error: err.message });
else {
return next(err, 0); return next(err, 0);
} }
else {
sync();
}
}); });
}; };

2
util/sync.js
View File

@ -4,8 +4,6 @@
process.env.NODE_ENV = process.env.NODE_ENV || 'development'; process.env.NODE_ENV = process.env.NODE_ENV || 'development';
require('buffertools').extend();
var SYNC_VERSION = '0.1'; var SYNC_VERSION = '0.1';
var program = require('commander'); var program = require('commander');
var HistoricSync = require('../lib/HistoricSync').class(); var HistoricSync = require('../lib/HistoricSync').class();