Skip to content

Commit 1079bfa

Browse files
committed
Adjust scopes
- Wind down scope for loggers
1 parent 2b64748 commit 1079bfa

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/org/phoebus/channelfinder/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@SpringBootApplication
4444
public class Application implements ApplicationRunner {
4545

46-
public static final Logger logger = Logger.getLogger(Application.class.getName());
46+
private static final Logger logger = Logger.getLogger(Application.class.getName());
4747

4848
public static void main(String[] args) {
4949
// Set the java truststore used by channelfinder

src/main/java/org/phoebus/channelfinder/rest/controller/InfoController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.LinkedHashMap;
1111
import java.util.Map;
1212
import java.util.logging.Level;
13-
import org.phoebus.channelfinder.Application;
13+
import java.util.logging.Logger;
1414
import org.phoebus.channelfinder.configuration.ElasticConfig;
1515
import org.phoebus.channelfinder.rest.api.IInfo;
1616
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +24,8 @@
2424
@EnableAutoConfiguration
2525
public class InfoController implements IInfo {
2626

27+
private static final Logger logger = Logger.getLogger(InfoController.class.getName());
28+
2729
@Value("${channelfinder.version:4.7.0}")
2830
private String version;
2931

@@ -51,16 +53,14 @@ public String info() {
5153
ElasticsearchVersionInfo elasticVersion = response.version();
5254
elasticInfo.put("version", elasticVersion.number());
5355
} 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);
5657
elasticInfo.put("status", "Failed to connect to elastic " + e.getLocalizedMessage());
5758
}
5859
cfServiceInfo.put("elastic", elasticInfo);
5960
try {
6061
return objectMapper.writeValueAsString(cfServiceInfo);
6162
} 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);
6464
return "Failed to gather ChannelFinder service info";
6565
}
6666
}

0 commit comments

Comments
 (0)