summaryrefslogtreecommitdiff
path: root/src/com/p4square
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2014-05-29 20:31:37 -0700
committerJesse Morgan <jesse@jesterpm.net>2014-05-29 20:31:37 -0700
commit064a247ac54769baa0f56bde588fa4894fddd505 (patch)
tree1a8aae45690996a74a9f5ad9f74eef42ed43a609 /src/com/p4square
parent706466db4a2cdf9978543d2ab5b1e5af1bdbaf09 (diff)
Loading config earlier.
Diffstat (limited to 'src/com/p4square')
-rw-r--r--src/com/p4square/grow/GrowProcessComponent.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/p4square/grow/GrowProcessComponent.java b/src/com/p4square/grow/GrowProcessComponent.java
index 9a7de6f..18b3d5b 100644
--- a/src/com/p4square/grow/GrowProcessComponent.java
+++ b/src/com/p4square/grow/GrowProcessComponent.java
@@ -41,7 +41,7 @@ public class GrowProcessComponent extends Component {
this(new Config());
}
- public GrowProcessComponent(Config config) {
+ public GrowProcessComponent(Config config) throws Exception {
// Clients
getClients().add(Protocol.FILE);
getClients().add(Protocol.HTTP);
@@ -49,6 +49,7 @@ public class GrowProcessComponent extends Component {
// Prepare mConfig
mConfig = config;
+ mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties"));
// Frontend
GrowFrontend frontend = new GrowFrontend(mConfig);
@@ -69,9 +70,6 @@ public class GrowProcessComponent extends Component {
@Override
public void start() throws Exception {
- // Load mConfigs
- mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties"));
-
String configDomain = getContext().getParameters().getFirstValue("com.p4square.grow.configDomain");
if (configDomain != null) {
mConfig.setDomain(configDomain);