ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: dotenv real path getter improved

pull/447/head
pabloFuente 2020-04-22 15:25:08 +02:00
parent b17f2988b0
commit da26ffe5ba
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -27,6 +27,7 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -886,28 +887,31 @@ public class OpenviduConfig {
} }
} }
public Path getDotenvFilePathFromDotenvPath(String dotenvPathProperty) {
if (dotenvPathProperty.endsWith(".env")) {
// Is file
return Paths.get(dotenvPathProperty);
} else if (dotenvPathProperty.endsWith("/")) {
// Is folder
return Paths.get(dotenvPathProperty + ".env");
} else {
// Is a folder not ending in "/"
return Paths.get(dotenvPathProperty + "/.env");
}
}
public File getDotenvFile() { public File getDotenvFile() {
if (this.getDotenvPath() != null && !this.getDotenvPath().isEmpty()) { if (getDotenvPath() != null && !getDotenvPath().isEmpty()) {
File file = new File(this.getDotenvPath());
Path path = getDotenvFilePathFromDotenvPath(getDotenvPath());
File file = path.toFile();
if (file.exists()) { if (file.exists()) {
if (file.isDirectory()) { return file;
file = new File(file, ".env");
if (file.exists() && file.isFile()) {
return file;
} else {
log.error(".env file not found at folder {}", this.getDotenvPath());
}
} else {
if (".env".equals(file.getName())) {
return file;
} else {
log.error("DOTEN_PATH configuration property refers to a file which is not .env ({})",
this.getDotenvPath());
}
}
} else { } else {
log.error(".env file not found at {}", this.getDotenvPath()); log.error(".env file not found at {}", path.toAbsolutePath().toString());
} }
} else { } else {
log.warn("DOTENV_PATH configuration property is not defined"); log.warn("DOTENV_PATH configuration property is not defined");
} }