Commit @d0e8823a29dd589002477787089d2c8481221bdf

[Notice] Announcing the End of Demo Server [Read me]

Yi EungJun 2015-03-03

Revert "config: Fix config error while starting Yobi"

This reverts commit 53920e0315f62917961a5b9fa4f8640997ea35ef.

Copying and creating application.conf from application.conf.default was
done while building but it does not work for standalone distribution
because it does not contain conf directory. The process should be done
at the first starting of Yobi.

@d0e8823a29dd589002477787089d2c8481221bdf

8e00b08

d0e8823

app/Global.java

--- app/Global.java

+++ app/Global.java


 
 public class Global extends GlobalSettings {
     private static final String[] INITIAL_ENTITY_NAME = {"users", "roles", "siteAdmins"};
+    public static final String APPLICATION_CONF_DEFAULT = "application.conf.default";
+    public static final String APPLICATION_CONF = "application.conf";
+    public static final String CONFIG_DIRNAME = "conf";
     private final String DEFAULT_SECRET = "VA2v:_I=h9>?FYOH:@ZhW]01P<mWZAKlQ>kk>Bo`mdCiA>pDw64FcBuZdDh<47Ew";
 
     private boolean isSecretInvalid = false;
     private boolean isRestartRequired = false;
-
+    private boolean isValidationRequired = false;
     private MailboxService mailboxService = new MailboxService();
 
     @Override
+    public Configuration onLoadConfig(play.Configuration config, File path, ClassLoader classloader) {
+        String basePath = path.getAbsolutePath();
+        Path pathToDefaultConfig = Paths.get(basePath, CONFIG_DIRNAME, APPLICATION_CONF_DEFAULT);
+        Path pathToConfig = Paths.get(basePath, CONFIG_DIRNAME, APPLICATION_CONF);
+        File configFile = pathToConfig.toFile();
+
+        if (!configFile.exists()) {
+            try {
+                Files.copy(pathToDefaultConfig, pathToConfig);
+            } catch (IOException e) {
+                play.Logger.error("Failed to initialize configuration", e);
+                return null;
+            }
+            Config parsedConfig = ConfigFactory.parseFileAnySyntax(configFile);
+            return new Configuration(ConfigFactory.load(classloader, parsedConfig));
+        } else {
+            if (!configFile.isFile()) {
+                play.Logger.error(
+                        "Failed to initialize configuration: " + pathToConfig + " is a directory.");
+                return null;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
     public void onStart(Application app) {
         isSecretInvalid = equalsDefaultSecret();
         insertInitialData();

8e00b08

project/BuildConfig.scala (deleted)

--- project/BuildConfig.scala

...	...	@@ -1,45 +0,0 @@
	1	-import sbt._
	2	-import java.nio.file.Files
	3	-import java.nio.file.Paths
	4	-import java.nio.file.Path
	5	-import java.io.IOException;
	6	-
	7	-object ApplicationBuild extends Build {
	8	-
	9	- val APPLICATION_CONF_DEFAULT = "application.conf.default"
	10	- val APPLICATION_CONF = "application.conf"
	11	- val LOG_CONF_DEFAULT = "application-logger.xml.default"
	12	- val LOG_CONF = "application-logger.xml"
	13	- val CONFIG_DIRNAME = "conf"
	14	-
	15	- def basePath = new File(System.getProperty("user.dir")).getAbsolutePath()
	16	-
	17	- def configDirPath = basePath + "/" + CONFIG_DIRNAME
	18	-
	19	- def initConfig(pathToDefaultConfig: Path, pathToConfig: Path): Unit = {
	20	- val configFile = pathToConfig.toFile()
	21	-
	22	- if (!configFile.exists()) {
	23	- try {
	24	- Files.copy(pathToDefaultConfig, pathToConfig)
	25	- } catch {
	26	- case e: IOException => throw new Exception("Failed to initialize configuration", e)
	27	- }
	28	- } else {
	29	- if (!configFile.isFile()) {
	30	- throw new Exception("Failed to initialize configuration: '" + pathToConfig + "' is a directory.")
	31	- }
	32	- }
	33	- }
	34	-
	35	- def initConfig: Unit = {
	36	- initConfig(
	37	- Paths.get(configDirPath, APPLICATION_CONF_DEFAULT),
	38	- Paths.get(configDirPath, APPLICATION_CONF))
	39	- initConfig(
	40	- Paths.get(configDirPath, LOG_CONF_DEFAULT),
	41	- Paths.get(configDirPath, LOG_CONF))
	42	- }
	43	-
	44	- val main = initConfig
	45	-}

Add a comment

Open 0
Closed 0

List

...	...	@@ -60,14 +60,44 @@
60	60
61	61	public class Global extends GlobalSettings {
62	62	private static final String[] INITIAL_ENTITY_NAME = {"users", "roles", "siteAdmins"};
	63	+ public static final String APPLICATION_CONF_DEFAULT = "application.conf.default";
	64	+ public static final String APPLICATION_CONF = "application.conf";
	65	+ public static final String CONFIG_DIRNAME = "conf";
63	66	private final String DEFAULT_SECRET = "VA2v:_I=h9>?FYOH:@ZhW]01P<mWZAKlQ>kk>Bo`mdCiA>pDw64FcBuZdDh<47Ew";
64	67
65	68	private boolean isSecretInvalid = false;
66	69	private boolean isRestartRequired = false;
67		-
	70	+ private boolean isValidationRequired = false;
68	71	private MailboxService mailboxService = new MailboxService();
69	72
70	73	@Override
	74	+ public Configuration onLoadConfig(play.Configuration config, File path, ClassLoader classloader) {
	75	+ String basePath = path.getAbsolutePath();
	76	+ Path pathToDefaultConfig = Paths.get(basePath, CONFIG_DIRNAME, APPLICATION_CONF_DEFAULT);
	77	+ Path pathToConfig = Paths.get(basePath, CONFIG_DIRNAME, APPLICATION_CONF);
	78	+ File configFile = pathToConfig.toFile();
	79	+
	80	+ if (!configFile.exists()) {
	81	+ try {
	82	+ Files.copy(pathToDefaultConfig, pathToConfig);
	83	+ } catch (IOException e) {
	84	+ play.Logger.error("Failed to initialize configuration", e);
	85	+ return null;
	86	+ }
	87	+ Config parsedConfig = ConfigFactory.parseFileAnySyntax(configFile);
	88	+ return new Configuration(ConfigFactory.load(classloader, parsedConfig));
	89	+ } else {
	90	+ if (!configFile.isFile()) {
	91	+ play.Logger.error(
	92	+ "Failed to initialize configuration: " + pathToConfig + " is a directory.");
	93	+ return null;
	94	+ }
	95	+ }
	96	+
	97	+ return null;
	98	+ }
	99	+
	100	+ @Override
71	101	public void onStart(Application app) {
72	102	isSecretInvalid = equalsDefaultSecret();
73	103	insertInitialData();

Delete comment