mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed hard-coded path in log config and refinded logging in settingsprovider

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-02-21 14:52:35 +01:00
parent be5fce0ee9
commit deded33da8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
View File

@@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Optional;
@@ -86,8 +87,10 @@ public class SettingsProvider implements Provider<Settings> {
}
LOG.info("Settings loaded from {}", path);
return Stream.of(settings);
} catch (NoSuchFileException e) {
return Stream.empty();
} catch (IOException e) {
LOG.info("Failed to load settings, creating new one.");
LOG.warn("Exception while loading settings from " + path, e);
return Stream.empty();
}
}

4
main/launcher/src/main/resources/logback.xml
View File

@@ -10,10 +10,10 @@
<if condition="isDefined(&quot;cryptomator.logDir&quot;)">
<then>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${user.home}/Library/Logs/Cryptomator/cryptomator.log</file>
<file>${user.home}/${cryptomator.logDir}/cryptomator0.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
<fileNamePattern>${user.home}/${cryptomator.logDir}/cryptomator%i.log</fileNamePattern>
<minIndex>0</minIndex>
<minIndex>1</minIndex>
<maxIndex>9</maxIndex>
</rollingPolicy>
<triggeringPolicy class="org.cryptomator.logging.LaunchBasedTriggeringPolicy" />