Skip to content

Commit ff2def6

Browse files
committed
Olog client information HTTP header, for logging on service
1 parent 1019fcf commit ff2def6

File tree

1 file changed

+6
-1
lines changed
  • app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api

1 file changed

+6
-1
lines changed

app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/OlogClient.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@
5555
*/
5656
public class OlogClient implements LogClient {
5757
private static final Logger logger = Logger.getLogger(OlogClient.class.getName());
58-
5958
private final WebResource service;
6059

60+
private static final String OLOG_CLIENT_INFO_HEADER = "X-Olog-Client-Info";
61+
private static final String CLIENT_INFO =
62+
"CS Studio " + org.phoebus.ui.application.Messages.AppVersion + " on " + System.getProperty("os.name");
63+
6164
/**
6265
* Builder Class to help create a olog client.
6366
*
@@ -206,6 +209,7 @@ private LogEntry save(LogEntry log, LogEntry inReplyTo) throws LogbookException
206209
clientResponse = service.path("logs")
207210
.queryParams(queryParams)
208211
.type(MediaType.APPLICATION_JSON)
212+
.header(OLOG_CLIENT_INFO_HEADER, CLIENT_INFO)
209213
.accept(MediaType.APPLICATION_XML)
210214
.accept(MediaType.APPLICATION_JSON)
211215
.put(ClientResponse.class, OlogObjectMappers.logEntrySerializer.writeValueAsString(log));
@@ -303,6 +307,7 @@ private SearchResult findLogs(MultivaluedMap<String, String> searchParams) throw
303307
// Convert List<XmlLog> into List<LogEntry>
304308
final OlogSearchResult ologSearchResult = OlogObjectMappers.logEntryDeserializer.readValue(
305309
service.path("logs/search").queryParams(searchParams)
310+
.header(OLOG_CLIENT_INFO_HEADER, CLIENT_INFO)
306311
.accept(MediaType.APPLICATION_JSON)
307312
.get(String.class),
308313
OlogSearchResult.class);

0 commit comments

Comments
 (0)