You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/05 09:45:07 UTC
[3/5] incubator-ignite git commit: # ignite-843 WIP error sending.
# ignite-843 WIP error sending.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/494cb37e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/494cb37e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/494cb37e
Branch: refs/heads/ignite-843
Commit: 494cb37ee2f1e01279e0ab946b9865452c087d9a
Parents: ae2740b
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 13:59:15 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 13:59:15 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/routes/caches.js | 10 +++++-----
modules/webconfig/nodejs/routes/clusters.js | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/494cb37e/modules/webconfig/nodejs/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/caches.js b/modules/webconfig/nodejs/routes/caches.js
index 1d43d8d..c4dfc9f 100644
--- a/modules/webconfig/nodejs/routes/caches.js
+++ b/modules/webconfig/nodejs/routes/caches.js
@@ -30,7 +30,7 @@ function selectAll(req, res) {
// Get owned space and all accessed space.
db.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, function (err, spaces) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var space_ids = spaces.map(function(value, index) {
return value._id;
@@ -39,7 +39,7 @@ function selectAll(req, res) {
// Get all caches for spaces.
db.Cache.find({space: {$in: space_ids}}, function (err, caches) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
res.json({spaces: spaces, caches: caches});
});
@@ -60,7 +60,7 @@ router.post('/save', function(req, res) {
if (req.body._id)
db.Cache.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
});
@@ -69,7 +69,7 @@ router.post('/save', function(req, res) {
cache.save(function(err, cache) {
if (err)
- return res.send(err.message);
+ return res.status(500).send(err.message);
res.send(cache._id);
});
@@ -82,7 +82,7 @@ router.post('/save', function(req, res) {
router.post('/remove', function(req, res) {
db.Cache.remove(req.body, function (err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
})
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/494cb37e/modules/webconfig/nodejs/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/clusters.js b/modules/webconfig/nodejs/routes/clusters.js
index b8f123b..da2b347 100644
--- a/modules/webconfig/nodejs/routes/clusters.js
+++ b/modules/webconfig/nodejs/routes/clusters.js
@@ -30,7 +30,7 @@ function selectAll(req, res) {
// Get owned space and all accessed space.
db.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, function (err, spaces) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var space_ids = spaces.map(function(value) {
return value._id;
@@ -43,7 +43,7 @@ function selectAll(req, res) {
// Get all clusters for spaces.
db.Cluster.find({space: {$in: space_ids}}, function (err, clusters) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var cachesJson = caches.map(function(cache) {
return {value: cache._id, label: cache.name};
@@ -69,7 +69,7 @@ router.post('/save', function(req, res) {
if (req.body._id)
db.Cluster.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
});
@@ -78,7 +78,7 @@ router.post('/save', function(req, res) {
cluster.save(function(err, cluster) {
if (err)
- return res.send(err.message);
+ return res.status(500).send(err.message);
res.send(cluster._id);
});
@@ -91,7 +91,7 @@ router.post('/save', function(req, res) {
router.post('/remove', function(req, res) {
db.Cluster.remove(req.body, function (err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
})