Skip to content

Always check bundled settings.ini, regardless of additional -settings #3491

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

Merged
kasemir merged 1 commit into from
Aug 6, 2025
Merged

Always check bundled settings.ini, regardless of additional -settings #3491

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
49 changes: 17 additions & 32 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 @@ -27,16 +27,15 @@

@SuppressWarnings("nls")
public class Launcher {
private static final String SETTINGS_OPTION = "-settings";
private static final String LOGGING_OPTION = "-logging";
private static final String DEFAULT_LOGGING_FILE="/logging.properties";
private static final String LOGGING_PROP = "java.util.logging.config.file";

public static void main(final String[] original_args) throws Exception {
// First Handle arguments, potentially not even starting the UI
// settings and logging will define the phoebus.install value if not exist
// settings and logging will define the phoebus.install value if not exist
final List<String> args = new ArrayList<>(List.of(original_args));

//Handle logging first
int indexOf = args.indexOf(LOGGING_OPTION);
String loggingFilePath = null;
Expand All @@ -60,22 +59,22 @@ public static void main(final String[] original_args) throws Exception {
errorLoggingOption = "User logging file " + loggingFilePath + " not found";
}
}

//If no logging found use the default one
if(loggingStream == null) {
loggingFilePath = Launcher.class.getResource(DEFAULT_LOGGING_FILE).getFile();
loggingStream = Launcher.class.getResourceAsStream(DEFAULT_LOGGING_FILE);
}

//Load logging configuration
LogManager.getLogManager().readConfiguration(loggingStream);
final Logger logger = Logger.getLogger(Launcher.class.getPackageName());
logger.log(Level.CONFIG, "Loading logging configuration from " + loggingFilePath);

if(errorLoggingOption != null) {
logger.log(Level.WARNING, errorLoggingOption);
}

boolean showLaunchError = false;

// Can't change default charset, but warn if it's not UTF-8.
Expand All @@ -92,35 +91,21 @@ public static void main(final String[] original_args) throws Exception {
logger.severe("Default charset is " + cs.displayName() + " instead of UTF-8.");
logger.severe("Add -D\"file.encoding=UTF-8\" to java command line or JAVA_TOOL_OPTIONS");
}

//Handle user settings.ini in order to get Locations informations
//as user home directory and phoebus folder name
//Install path will be set on call of install()
//Locations.initialize();
indexOf = args.indexOf(SETTINGS_OPTION);
File site_settings = null;
if(indexOf > 0 && indexOf <= args.size()) {
String settingsFilePath = args.get(indexOf + 1);
site_settings = new File(settingsFilePath);
}

if(site_settings == null || !site_settings.exists()) {
// Check for site-specific settings.ini bundled into distribution
// before potentially adding command-line settings.
String settingsError = site_settings != null ? site_settings.getAbsolutePath() + " not found" : "is not defined";
logger.log(Level.WARNING, "Settings file " + settingsError);
site_settings = new File(Locations.install(), "settings.ini");
}

if(site_settings != null && site_settings.exists()) {
logger.info("Loading settings from " + site_settings.getAbsolutePath());
FileInputStream fileInputStream = new FileInputStream(site_settings);

Locations.initialize();
// Check for site-specific settings.ini bundled into distribution
// before potentially adding command-line settings.
final File site_settings = new File(Locations.install(), "settings.ini");
if (site_settings.canRead())
{
logger.info("Loading bundled settings from " + site_settings.getAbsolutePath());
final FileInputStream fileInputStream = new FileInputStream(site_settings);
if (site_settings.getName().endsWith(".xml"))
Preferences.importPreferences(fileInputStream);
else
PropertyPreferenceLoader.load(fileInputStream);
}

// Handle arguments, potentially not even starting the UI
final Iterator<String> iter = args.iterator();
int port = -1;
Expand Down