|
10 | 10 | import java.util.LinkedHashMap; |
11 | 11 | import java.util.Map; |
12 | 12 | import java.util.logging.Level; |
13 | | -import org.phoebus.channelfinder.Application; |
| 13 | +import java.util.logging.Logger; |
14 | 14 | import org.phoebus.channelfinder.configuration.ElasticConfig; |
15 | 15 | import org.phoebus.channelfinder.rest.api.IInfo; |
16 | 16 | import org.springframework.beans.factory.annotation.Autowired; |
|
24 | 24 | @EnableAutoConfiguration |
25 | 25 | public class InfoController implements IInfo { |
26 | 26 |
|
| 27 | + private static final Logger logger = Logger.getLogger(InfoController.class.getName()); |
| 28 | + |
27 | 29 | @Value("${channelfinder.version:4.7.0}") |
28 | 30 | private String version; |
29 | 31 |
|
@@ -51,16 +53,14 @@ public String info() { |
51 | 53 | ElasticsearchVersionInfo elasticVersion = response.version(); |
52 | 54 | elasticInfo.put("version", elasticVersion.number()); |
53 | 55 | } catch (IOException e) { |
54 | | - Application.logger.log( |
55 | | - Level.WARNING, "Failed to create ChannelFinder service info resource.", e); |
| 56 | + logger.log(Level.WARNING, "Failed to create ChannelFinder service info resource.", e); |
56 | 57 | elasticInfo.put("status", "Failed to connect to elastic " + e.getLocalizedMessage()); |
57 | 58 | } |
58 | 59 | cfServiceInfo.put("elastic", elasticInfo); |
59 | 60 | try { |
60 | 61 | return objectMapper.writeValueAsString(cfServiceInfo); |
61 | 62 | } catch (JsonProcessingException e) { |
62 | | - Application.logger.log( |
63 | | - Level.WARNING, "Failed to create ChannelFinder service info resource.", e); |
| 63 | + logger.log(Level.WARNING, "Failed to create ChannelFinder service info resource.", e); |
64 | 64 | return "Failed to gather ChannelFinder service info"; |
65 | 65 | } |
66 | 66 | } |
|
0 commit comments