Added conf file for configuring server ports
Former-commit-id: 16f48cef9ddfdf3722bff863eb520e807d7c0c37
This commit is contained in:
parent
46728b4768
commit
8cd81766a0
6 changed files with 37 additions and 11 deletions
2
hal.conf
Executable file
2
hal.conf
Executable file
|
|
@ -0,0 +1,2 @@
|
||||||
|
http_port=8080
|
||||||
|
sync_port=6666
|
||||||
32
src/se/koc/hal/HalContext.java
Normal file → Executable file
32
src/se/koc/hal/HalContext.java
Normal file → Executable file
|
|
@ -2,15 +2,41 @@ package se.koc.hal;
|
||||||
|
|
||||||
import zutil.db.DBConnection;
|
import zutil.db.DBConnection;
|
||||||
|
|
||||||
|
import java.io.FileReader;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
public class HalContext {
|
public class HalContext {
|
||||||
|
// Constants
|
||||||
|
private static final String CONF_FILE = "hal.conf";
|
||||||
|
|
||||||
public static DBConnection db;
|
// Variables
|
||||||
|
public static DBConnection db;
|
||||||
|
|
||||||
|
public static Properties conf;
|
||||||
|
private static Properties defaultConf;
|
||||||
|
|
||||||
|
|
||||||
|
static {
|
||||||
|
defaultConf = new Properties();
|
||||||
|
defaultConf.setProperty("http_port", ""+8080);
|
||||||
|
defaultConf.setProperty("sync_port", ""+6666);
|
||||||
|
|
||||||
|
HalContext.initialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void initialize(){
|
||||||
|
try {
|
||||||
|
// Read conf
|
||||||
|
conf = new Properties(defaultConf);
|
||||||
|
FileReader in = new FileReader(CONF_FILE);
|
||||||
|
conf.load(in);
|
||||||
|
in.close();
|
||||||
|
|
||||||
public static void initialize() throws Exception{
|
// Init DB
|
||||||
db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
|
db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
|
||||||
|
} catch (Exception e){
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,6 @@ public class PowerChallenge {
|
||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
|
|
||||||
HalContext.initialize();
|
|
||||||
|
|
||||||
// init logging
|
// init logging
|
||||||
LogUtil.setGlobalLevel(Level.ALL);
|
LogUtil.setGlobalLevel(Level.ALL);
|
||||||
LogUtil.setGlobalFormatter(new CompactLogFormatter());
|
LogUtil.setGlobalFormatter(new CompactLogFormatter());
|
||||||
|
|
@ -43,7 +41,8 @@ public class PowerChallenge {
|
||||||
daemon.initiate(daemonTimer);
|
daemon.initiate(daemonTimer);
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpServer http = new HttpServer(80);
|
HttpServer http = new HttpServer(
|
||||||
|
Integer.parseInt(HalContext.conf.getProperty("http_port")));
|
||||||
http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
|
http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
|
||||||
http.setPage("/", new PCOverviewHttpPage());
|
http.setPage("/", new PCOverviewHttpPage());
|
||||||
http.setPage("/configure", new PCConfigureHttpPage());
|
http.setPage("/configure", new PCConfigureHttpPage());
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,10 @@ import zutil.net.threaded.ThreadedTCPNetworkServerThread;
|
||||||
|
|
||||||
public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
|
public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
|
||||||
private static final Logger logger = LogUtil.getLogger();
|
private static final Logger logger = LogUtil.getLogger();
|
||||||
public static final int SERVER_PORT = 6666;
|
|
||||||
|
|
||||||
|
|
||||||
public DataSynchronizationDaemon() {
|
public DataSynchronizationDaemon() {
|
||||||
super(SERVER_PORT);
|
super(Integer.parseInt(HalContext.conf.getProperty("sync_port")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
0
src/se/koc/hal/page/PCConfigureHttpPage.java
Normal file → Executable file
0
src/se/koc/hal/page/PCConfigureHttpPage.java
Normal file → Executable file
0
src/se/koc/hal/page/PCHeatMapHttpPage.java
Normal file → Executable file
0
src/se/koc/hal/page/PCHeatMapHttpPage.java
Normal file → Executable file
Loading…
Add table
Add a link
Reference in a new issue