ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added hal prefix to all config properties

Browse source
This commit is contained in:
Ziver Koc 2021-07-19 18:06:00 +02:00
parent 4dfa80c17f
commit 203bb67f7f
12 changed files with 123 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hal-core/src/se/hal/HalContext.java
View file

@ -1,10 +1,7 @@
package se.hal;
import se.hal.struct.User;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
import zutil.db.DBUpgradeHandler;
import zutil.db.SQLResultHandler;
import zutil.db.handler.PropertiesSQLResult;
import zutil.io.file.FileUtil;
import zutil.log.LogUtil;
@ -12,12 +9,11 @@ import zutil.log.LogUtil;
import java.io.File;
import java.io.FileReader;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -25,8 +21,8 @@ public class HalContext {
private static final Logger logger = LogUtil.getLogger();
// Constants
public static final String PROPERTY_HTTP_PORT = "hal.http_port";
public static final String PROPERTY_MAP_BACKGROUND_IMAGE = "hal.map_bgimage";
public static final String CONFIG_HTTP_PORT = "hal_core.http_port";
public static final String CONFIG_MAP_BACKGROUND_IMAGE = "hal_core.map_bgimage";
public static final String RESOURCE_ROOT;
static {
@ -53,7 +49,7 @@ public class HalContext {
static {
// Set default values to get Hal up and running
fileConf.setProperty(PROPERTY_HTTP_PORT, "" + 8080);
fileConf.setProperty(CONFIG_HTTP_PORT, "" + 8080);
}
@ -141,12 +137,16 @@ public class HalContext {
return getBooleanProperty(key);
}
public static void setProperty(String key, String value) throws SQLException {
PreparedStatement stmt = db.getPreparedStatement("REPLACE INTO conf (key, value) VALUES (?, ?)");
stmt.setObject(1, key);
stmt.setObject(2, value);
DBConnection.exec(stmt);
dbConf.setProperty(key, value);
public static void setProperty(String key, String value) {
try {
PreparedStatement stmt = db.getPreparedStatement("REPLACE INTO conf (key, value) VALUES (?, ?)");
stmt.setObject(1, key);
stmt.setObject(2, value);
DBConnection.exec(stmt);
dbConf.setProperty(key, value);
} catch (SQLException e) {
logger.log(Level.SEVERE, "Was unable to save property: " + key + " = " + value, e);
}
}

2
hal-core/src/se/hal/HalServer.java
View file

@ -52,7 +52,7 @@ public class HalServer {
// init variables
pluginManager = new PluginManager();
daemonExecutor = Executors.newScheduledThreadPool(1); // We set only one thread for easier troubleshooting
http = new HttpServer(HalContext.getIntegerProperty(HalContext.PROPERTY_HTTP_PORT));
http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT));
// Upgrade database
HalDatabaseUpgradeManager.initialize(pluginManager);

4
hal-core/src/se/hal/page/MapWebPage.java
View file

@ -77,7 +77,7 @@ public class MapWebPage extends HalWebPage {
private void loadBgImage() {
String property = HalContext.getStringProperty(HalContext.PROPERTY_MAP_BACKGROUND_IMAGE);
String property = HalContext.getStringProperty(HalContext.CONFIG_MAP_BACKGROUND_IMAGE);
if (property != null) {
String[] split = property.split(",", 2);
bgType = split[0];
@ -86,6 +86,6 @@ public class MapWebPage extends HalWebPage {
}
private void saveBgImage(String type, byte[] data) throws SQLException {
HalContext.setProperty(HalContext.PROPERTY_MAP_BACKGROUND_IMAGE, type + "," + Base64Encoder.encode(data));
HalContext.setProperty(HalContext.CONFIG_MAP_BACKGROUND_IMAGE, type + "," + Base64Encoder.encode(data));
}
}