Fix log issue in RaspberryAgent

merge-requests/1/head
charithag 9 years ago
parent f5976c3fb2
commit dbe107e538

@ -120,15 +120,37 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
//URL: https://localhost:9443/devicecloud/manager/devices/username/{username} //URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager"; deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager";
listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username; listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
result = get(listAllDevicesEndPoint, {}, "json");
var data = {}; var ownDevices = result.data;
//XMLHTTPRequest's GET
try { var allDevices = [];
result = get(listAllDevicesEndPoint, data, "json"); deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager";
}catch(err){ var endPoint = deviceCloudService + "/group/all";
log.error("Error occured while retrieveing all devices with username: "+user.username); var data = {"username": user.username};
result=[]; var groups = get(endPoint, data, "json").data;
for (var g in groups) {
endPoint = deviceCloudService + "/group/id/" + groups[g].id + "/device/all";
data = {"username": user.username};
var deviceInGroup = get(endPoint, data, "json").data;
groups[g].devices = deviceInGroup;
allDevices.push(groups[g]);
for (var od in ownDevices) {
for (var gd in deviceInGroup) {
if (deviceInGroup[gd].deviceIdentifier == ownDevices[od].deviceIdentifier) {
ownDevices[od].deviceIdentifier = -1;
}
}
}
}
var unsharedDevices = [];
for (var od in ownDevices) {
if (ownDevices[od].deviceIdentifier != -1){
unsharedDevices.push(ownDevices[od]);
}
} }
allDevices.push({id: 0, devices: unsharedDevices});
result.data = allDevices;
} else if (uriMatcher.match("/{context}/api/devices/types")) { } else if (uriMatcher.match("/{context}/api/devices/types")) {

@ -76,7 +76,6 @@ if (uriMatcher.match("/{context}/api/group/add")) {
//URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId} //URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}
endPoint = deviceCloudService + "/group/id/" + groupId; endPoint = deviceCloudService + "/group/id/" + groupId;
log.info(endPoint);
data = {"username": user.username}; data = {"username": user.username};
result = get(endPoint, data, "json"); result = get(endPoint, data, "json");
@ -226,10 +225,17 @@ if (uriMatcher.match("/{context}/api/group/add")) {
groupId = uriMatcher.elements().groupId; groupId = uriMatcher.elements().groupId;
//URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}
endPoint = deviceCloudService + "/group/id/" + groupId;
data = {"username": user.username};
var group = get(endPoint, data, "json").data;
//URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}/device/all //URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}/device/all
endPoint = deviceCloudService + "/group/id/" + groupId + "/device/all"; endPoint = deviceCloudService + "/group/id/" + groupId + "/device/all";
data = {"username": user.username}; data = {"username": user.username};
result = get(endPoint, data, "json"); result = get(endPoint, data, "json");
group.devices = result.data;
result.data = {group: group}
} else if (uriMatcher.match("/{context}/api/group/id/{groupId}/assign")) { } else if (uriMatcher.match("/{context}/api/group/id/{groupId}/assign")) {

Loading…
Cancel
Save