zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Merge branch 'develop' into f/logging

Browse Source
This commit is contained in:
delvh
2019-11-29 21:04:44 +01:00
committed by GitHub
parent 8e5d166d75 363aa1a889
commit eed12695bb
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/envoy/client/Config.java
View File

@@ -32,7 +32,7 @@ public class Config {
*
* @param properties a {@link Properties} object containing information about
* the server and port, as well as the path to the local
* database
* database and the synchronization timeout
* @since Envoy v0.1-alpha
*/
public void load(Properties properties) {
@@ -64,8 +64,6 @@ public class Config {
case "-db":
localDB = new File(args[++i]);
}
if (localDB == null) localDB = new File(".\\localDB");
if (syncTimeout == 0) syncTimeout = 1000;
}
/**

33
src/main/java/envoy/client/ui/Startup.java
View File

@@ -32,21 +32,25 @@ public class Startup {
logger.setLevel(Level.ALL);
Config config = Config.getInstance();
if (args.length > 0) {
config.load(args);
} else {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
Properties configProperties = new Properties();
configProperties.load(loader.getResourceAsStream("client.properties"));
config.load(configProperties);
} catch (IOException e) {
e.printStackTrace();
}
// Load the configuration from client.properties first
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
Properties configProperties = new Properties();
configProperties.load(loader.getResourceAsStream("client.properties"));
config.load(configProperties);
} catch (IOException e) {
e.printStackTrace();
}
// Override configuration values with command line arguments
if (args.length > 0)
config.load(args);
if (!config.isInitialized()) {
logger.warning("Server or port are not defined. Exiting...");
JOptionPane.showMessageDialog(null, "Error loading configuration values.", "Configuration error",
JOptionPane.ERROR_MESSAGE);
System.exit(1);
}
@@ -55,16 +59,15 @@ public class Startup {
logger.warning("User name is not set or empty. Exiting...");
System.exit(1);
}
Client client = new Client(config, userName);
LocalDB localDB = new LocalDB(client.getSender());
Client client = new Client(config, userName);
LocalDB localDB = new LocalDB(client.getSender());
try {
localDB.initializeDBFile(config.getLocalDB());
} catch (EnvoyException e) {
e.printStackTrace();
JOptionPane.showMessageDialog(null,
"Error while loading local database: " + e.toString() + "\nChats will not be stored locally.",
"Local DB error",
JOptionPane.WARNING_MESSAGE);
"Local DB error", JOptionPane.WARNING_MESSAGE);
}
EventQueue.invokeLater(() -> {