Skip to content

removed monitor from import by ip instance #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 7, 2016
Merged

removed monitor from import by ip instance #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
979e168
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 3, 2016
5ef028e
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 3, 2016
5685105
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 4, 2016
19a5e68
removed monitor from import by ip instance
udeshrl Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 5 additions & 38 deletions server/app/model/classes/instance/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ var uniqueValidator = require('mongoose-unique-validator');
var logger = require('_pr/logger')(module);
var textSearch = require('mongoose-text-search');
var apiUtils = require('_pr/lib/utils/apiUtil.js');
var monitorsModel = require('_pr/model/monitors/monitors.js');

var Schema = mongoose.Schema;

Expand Down Expand Up @@ -347,11 +346,6 @@ var InstanceSchema = new Schema({
type: String,
required: false,
trim: true
},
monitorId: {
type: String,
required: false,
trim: true
}
});

Expand Down Expand Up @@ -591,7 +585,7 @@ var InstancesDao = function () {
var instanceList = instances.docs;
var count = 0;
for (var i = 0; i < instanceList.length; i++) {
(function (instance, i) {
(function (instance) {
if (instance.taskIds.length > 0) {
tasks.getTaskByIds(instance.taskIds, function (err, tasks) {
if (err) {
Expand All @@ -613,29 +607,24 @@ var InstancesDao = function () {
}
;
instance['tasks'] = taskList;
getMonitorDetail(instance, function (data) {
count++;
instanceList[i] = instance = data;
count++;
if (instanceList.length === count) {
instances.docs = instanceList;
return callback(null, instances);
}
});


}
})
} else {
getMonitorDetail(instance, function (data) {
count++;
instanceList[i] = instance = data;
count++;
if (instanceList.length === count) {
instances.docs = instanceList;
return callback(null, instances);
}
});

}
})(instanceList[i], i);
})(instanceList[i]);
}
}
});
Expand Down Expand Up @@ -2222,26 +2211,4 @@ var InstancesDao = function () {
};
};

function getMonitorDetail(data, callback) {
data = data.toObject();
if (data.monitorId) {
var monitorId = data.monitorId;
delete data['monitorId'];
monitorsModel.getById(monitorId, function (err, monitor) {
if (err || !monitor) {
data.monitor = null;
} else {
data.monitor = {};
data.monitor['id'] = monitor._id;
data.monitor['name'] = monitor.name;
}
callback(data);
});
} else {
delete data['monitorId'];
data.monitor = null;
callback(data);
}
}

module.exports = new InstancesDao();
1 change: 0 additions & 1 deletion server/app/routes/v1.0/routes_organizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
instanceState: nodeAlive,
bootStrapStatus: 'waiting',
tagServer: req.params.tagServer,
monitorId: req.params.monitorId,
runlist: [],
appUrls: appUrls,
users: [req.session.user.cn], //need to change this
Expand Down