honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduced version name to the info API

Browse Source 
Holds the name of the version as it is defined in the `pom.xml` (different than the version number that is automatically generated by `WatcherVersion`)

Original commit: elastic/x-pack-elasticsearch@b6cf221f63
This commit is contained in:
uboness 2015-05-15 04:54:33 +02:00
parent ba5f25f73c
commit 912bd1299b
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/elasticsearch/watcher/WatcherBuild.java
View File

@ -22,6 +22,7 @@ public class WatcherBuild {
public static final WatcherBuild CURRENT;
static {
String versionName = "NA";
String hash = "NA";
String hashShort = "NA";
String timestamp = "NA";
@ -38,23 +39,30 @@ public class WatcherBuild {
if (gitTimestampRaw != null) {
timestamp = ISODateTimeFormat.dateTimeNoMillis().withZone(UTC).print(Long.parseLong(gitTimestampRaw));
}
versionName = props.getProperty("version", "NA");
} catch (Exception e) {
// just ignore...
}
CURRENT = new WatcherBuild(hash, hashShort, timestamp);
CURRENT = new WatcherBuild(versionName, hash, hashShort, timestamp);
}
private final String versionName;
private final String hash;
private final String hashShort;
private final String timestamp;
WatcherBuild(String hash, String hashShort, String timestamp) {
WatcherBuild(String versionName, String hash, String hashShort, String timestamp) {
this.versionName = versionName;
this.hash = hash;
this.hashShort = hashShort;
this.timestamp = timestamp;
}
public String versionName() {
return versionName;
}
public String hash() {
return hash;
}
@ -77,6 +85,7 @@ public class WatcherBuild {
if (!hash.equals(that.hash)) return false;
if (!hashShort.equals(that.hashShort)) return false;
if (!timestamp.equals(that.timestamp)) return false;
if (!versionName.equals(that.versionName)) return false;
return true;
}
@ -86,19 +95,22 @@ public class WatcherBuild {
int result = hash.hashCode();
result = 31 * result + hashShort.hashCode();
result = 31 * result + timestamp.hashCode();
result = 31 * result + versionName.hashCode();
return result;
}
public static WatcherBuild readBuild(StreamInput in) throws IOException {
String versionName = in.readString();
String hash = in.readString();
String hashShort = in.readString();
String timestamp = in.readString();
return new WatcherBuild(hash, hashShort, timestamp);
return new WatcherBuild(versionName, hash, hashShort, timestamp);
}
public static void writeBuild(WatcherBuild build, StreamOutput out) throws IOException {
out.writeString(build.hash());
out.writeString(build.hashShort());
out.writeString(build.timestamp());
out.writeString(build.versionName);
out.writeString(build.hash);
out.writeString(build.hashShort);
out.writeString(build.timestamp);
}
}

1
src/main/java/org/elasticsearch/watcher/rest/action/RestWatcherInfoAction.java
View File

@ -34,6 +34,7 @@ public class RestWatcherInfoAction extends WatcherRestHandler {
public RestResponse buildResponse(WatcherStatsResponse watcherStatsResponse, XContentBuilder builder) throws Exception {
builder.startObject();
builder.startObject("version")
.field("name", watcherStatsResponse.getBuild().versionName())
.field("number", watcherStatsResponse.getVersion().number())
.field("build_hash", watcherStatsResponse.getBuild().hash())
.field("build_timestamp", watcherStatsResponse.getBuild().timestamp())