From deded33da8047ed31703db8aa21000c431e899d9 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 21 Feb 2019 14:52:35 +0100
Subject: [PATCH] fixed hard-coded path in log config and refinded logging in
 settingsprovider

---
 .../org/cryptomator/common/settings/SettingsProvider.java    | 5 ++++-
 main/launcher/src/main/resources/logback.xml                 | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
index f10014db0..3f4da5c45 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
@@ -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();
 		}
 	}
diff --git a/main/launcher/src/main/resources/logback.xml b/main/launcher/src/main/resources/logback.xml
index 46791f2dd..56d7eb6c7 100644
--- a/main/launcher/src/main/resources/logback.xml
+++ b/main/launcher/src/main/resources/logback.xml
@@ -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" />