Skip to content

Start and log error (rather than refusing to start) if error while loading settings from -settings flag #3968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LordIdra wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

Start and log error (rather than refusing to start) if error while loading settings from -settings flag #3968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions core/launcher/src/main/java/org/phoebus/product/Launcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,15 @@
iter.remove();

logger.info("Loading settings from " + location);
if (location.endsWith(".xml"))
Preferences.importPreferences(new FileInputStream(location));
else
PropertyPreferenceLoader.load(location);
try {

Check warning on line 143 in core/launcher/src/main/java/org/phoebus/product/Launcher.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested try block into a separate method. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaFUUFjVHgtdV_wvKrFb&open=AaFUUFjVHgtdV_wvKrFb&pullRequest=3968
if (location.endsWith(".xml"))
Preferences.importPreferences(new FileInputStream(location));
else
PropertyPreferenceLoader.load(location);
} catch (Exception e) {
logger.severe("Failed to load settings from " + location);
e.printStackTrace();

Check warning on line 150 in core/launcher/src/main/java/org/phoebus/product/Launcher.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make sure this debug feature is deactivated before delivering the code in production. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaFUUFjVHgtdV_wvKrFc&open=AaFUUFjVHgtdV_wvKrFc&pullRequest=3968
}

} else if (cmd.equals("-export_settings")) {
if (!iter.hasNext())
Expand Down
Loading