X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsStateImpl.java;h=d364620f56f09118a99cd36564146c1f61919a8f;hb=d471976de607d0db9dfce8f72dcaa6c45c2079d8;hp=b76ca5792deeb20ade7a6f4167b7909de2ee3590;hpb=40cdc5aa006aac762c2b241fdec2a33436d43840;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index b76ca5792..d364620f5 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -38,7 +38,7 @@ import org.argeo.api.cms.CmsState;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.auth.ident.IdentClient;
-import org.argeo.util.FsUtils;
+import org.argeo.cms.util.FsUtils;
 
 /**
  * Implementation of a {@link CmsState}, initialising the required services.
@@ -91,19 +91,21 @@ public class CmsStateImpl implements CmsState {
 	}
 
 	public void start() {
-//		Runtime.getRuntime().addShutdownHook(new CmsShutdown());
-
 		try {
+			// First init check
+			Path privateBase = getDataPath(KernelConstants.DIR_PRIVATE);
+			if (privateBase != null && !Files.exists(privateBase)) {// first init
+				firstInit();
+				Files.createDirectories(privateBase);
+			}
+
 			initSecurity();
 //			initArgeoLogger();
 
 			if (log.isTraceEnabled())
 				log.trace("CMS State started");
 
-//			String stateUuidStr = KernelUtils.getFrameworkProp(Constants.FRAMEWORK_UUID);
-//			this.uuid = UUID.fromString(stateUuidStr);
 			this.uuid = uuidFactory.timeUUID();
-//		this.cleanState = stateUuid.equals(frameworkUuid);
 
 			// hostname
 			this.hostname = getDeployProperty(CmsDeployProperty.HOST);
@@ -149,11 +151,6 @@ public class CmsStateImpl implements CmsState {
 				log.debug("## CMS starting... (" + uuid + ")\n" + sb + "\n");
 			}
 
-			Path nodeBase = getDataPath(KernelConstants.DIR_PRIVATE);
-			if (nodeBase != null && !Files.exists(nodeBase)) {// first init
-				firstInit();
-			}
-
 		} catch (RuntimeException | IOException e) {
 			log.error("## FATAL: CMS state failed", e);
 		}
@@ -161,7 +158,7 @@ public class CmsStateImpl implements CmsState {
 
 	private void initSecurity() {
 		// private directory permissions
-		Path privateDir = KernelUtils.getOsgiInstancePath(KernelConstants.DIR_PRIVATE);
+		Path privateDir = getDataPath(KernelConstants.DIR_PRIVATE);
 		if (privateDir != null) {
 			// TODO rather check whether we can read and write
 			Set<PosixFilePermission> posixPermissions = new HashSet<>();
@@ -169,9 +166,11 @@ public class CmsStateImpl implements CmsState {
 			posixPermissions.add(PosixFilePermission.OWNER_WRITE);
 			posixPermissions.add(PosixFilePermission.OWNER_EXECUTE);
 			try {
+				if (!Files.exists(privateDir))
+					Files.createDirectories(privateDir);
 				Files.setPosixFilePermissions(privateDir, posixPermissions);
 			} catch (IOException e) {
-				log.error("Cannot set permissions on " + privateDir);
+				log.error("Cannot set permissions on " + privateDir, e);
 			}
 		}