Skip to content

Commit 1584835

Browse files
committed
Shorten epoch to second precision.
Closes elastic#4696.
1 parent ba7699a commit 1584835

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void onFailure(Throwable t) {
9898
Table getTableWithHeader(final RestRequest request) {
9999
Table table = new Table();
100100
table.startHeaders();
101-
table.addCell("time(ms)", "desc:time, in milliseconds since epoch UTC, that the count was executed");
101+
table.addCell("epoch", "desc:seconds since 1970-01-01 00:00:00, that the count was executed");
102102
table.addCell("timestamp", "desc:time that the count was executed");
103103
table.addCell("count", "desc:the document count");
104104
table.endHeaders();
@@ -109,7 +109,7 @@ Table getTableWithHeader(final RestRequest request) {
109109

110110
private Table buildTable(RestRequest request, CountResponse response) {
111111
Table table = getTableWithHeader(request);
112-
long time = System.currentTimeMillis();
112+
long time = System.currentTimeMillis() / 1000;
113113
table.startRow();
114114
table.addCell(time);
115115
table.addCell(dateFormat.print(time));

src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onFailure(Throwable e) {
8181
Table getTableWithHeader(final RestRequest request) {
8282
Table t = new Table();
8383
t.startHeaders();
84-
t.addCell("time(ms)", "desc:time, in milliseconds since epoch UTC, that the count was executed");
84+
t.addCell("epoch", "desc:seconds since 1970-01-01 00:00:00, that the count was executed");
8585
t.addCell("timestamp", "desc:time that the count was executed");
8686
t.addCell("cluster", "desc:cluster name");
8787
t.addCell("status", "desc:health status");
@@ -100,7 +100,7 @@ Table getTableWithHeader(final RestRequest request) {
100100
private DateTimeFormatter dateFormat = DateTimeFormat.forPattern("HH:mm:ss");
101101

102102
private Table buildTable(final ClusterHealthResponse health, final RestRequest request) {
103-
long time = System.currentTimeMillis();
103+
long time = System.currentTimeMillis() / 1000;
104104
Table t = getTableWithHeader(request);
105105
t.startRow();
106106
t.addCell(time);

0 commit comments

Comments
 (0)