openstack
/
monasca-api
Code Issues Proposed changes

Add error field to Series 

Change how results are handled when measurement does not exist in Influxdb.

Change-Id: I89bb12ffc661e0826e27eb6105c51520b72930af
This commit is contained in:
Deklan Dieterly 2015-03-03 13:48:53 -07:00
parent d559e6cf66
commit 99d8ca92ab
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/main/java/monasca/api/infrastructure/persistence/influxdb/InfluxV9RepoReader.java
View File

@ -99,25 +99,7 @@ public class InfluxV9RepoReader {
this.influxName, this.influxUrl);
HttpEntity entity = response.getEntity();
if (entity != null) {
String entityString = EntityUtils.toString(entity);
if (entityString.equals("{\"results\":[{\"error\":\"measurement not found\"}]}")) {
logger.debug("Translating 'measurement not found' message to empty list");
return "{\"results\":[{}]}";
} else {
return entityString;
}
} else {
return null;
}
return entity != null ? EntityUtils.toString(entity) : null;
} finally {

7
java/src/main/java/monasca/api/infrastructure/persistence/influxdb/Series.java
View File

@ -16,6 +16,7 @@ package monasca.api.infrastructure.persistence.influxdb;
public class Series {
public SeriesElement[] results;
public String error;
boolean isEmpty() {
@ -27,11 +28,17 @@ public class Series {
return this.results[0].series;
}
public String getError() {
return this.error;
}
}
class SeriesElement {
public Serie[] series;
public String error;
}