summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Stenzel2017-07-22 09:31:36 +0200
committerSebastian Stenzel2017-07-22 09:31:36 +0200
commit87f4836418ea021e1d88f39673edfcac0efb31c4 (patch)
tree8f56185b5f4b84ec13cac742f3c7754ddc755388
parenta4a5ab8be8d27adf8c52fd233b5ef2a31be93eb1 (diff)
downloadaur-87f4836418ea021e1d88f39673edfcac0efb31c4.tar.gz
updated logger configuration
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD15
-rw-r--r--cryptomator.sh4
-rw-r--r--logback.xml44
4 files changed, 59 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 09eb43c851d..29921d8a44f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cryptomator
pkgdesc = Multiplatform transparent client-side encryption of your files in the cloud.
pkgver = 1.3.1
- pkgrel = 1
+ pkgrel = 2
url = https://cryptomator.org/
arch = any
license = GPL3
@@ -13,10 +13,11 @@ pkgbase = cryptomator
source = cryptomator.sh
source = cryptomator.desktop
source = cryptomator-vault.xml
+ source = logback.xml
sha256sums = ceb34e70a9f68544d8ff7be524bfb597238183adcd0a29d50e4509bc1dfa3a57
- sha256sums = c4c69b9e364469e7f1fa95fa2acaac269fb9ae18a5b9ff606b47511935a58cfc
+ sha256sums = fe190cfcf0f3da91b0314e2d76e86dc49ae8ef1d33558997f0b3fcd81d33e3c2
sha256sums = 1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464
sha256sums = 78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad
+ sha256sums = 913c7995d51f305c36a81cda9cbce96c9481a04516ccc57024f33590e1c822ea
pkgname = cryptomator
-
diff --git a/PKGBUILD b/PKGBUILD
index 5067d790a41..db1be61a451 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=cryptomator
pkgver=1.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Multiplatform transparent client-side encryption of your files in the cloud."
arch=("any")
url="https://cryptomator.org/"
@@ -13,11 +13,13 @@ makedepends=('java-runtime-openjdk=8' 'apache-ant')
source=("antkit-${pkgver}.tar.gz::https://github.com/cryptomator/cryptomator/releases/download/${pkgver}/antkit.tar.gz"
'cryptomator.sh'
'cryptomator.desktop'
- 'cryptomator-vault.xml')
+ 'cryptomator-vault.xml'
+ 'logback.xml')
sha256sums=('ceb34e70a9f68544d8ff7be524bfb597238183adcd0a29d50e4509bc1dfa3a57'
- 'c4c69b9e364469e7f1fa95fa2acaac269fb9ae18a5b9ff606b47511935a58cfc'
+ 'fe190cfcf0f3da91b0314e2d76e86dc49ae8ef1d33558997f0b3fcd81d33e3c2'
'1193f85b545298f6d474c7f17865433f25c73995b00894e0d7d7bc873c696464'
- '78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad')
+ '78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad'
+ '913c7995d51f305c36a81cda9cbce96c9481a04516ccc57024f33590e1c822ea')
build() {
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk/jre/
@@ -26,10 +28,11 @@ build() {
package() {
install -d ${pkgdir}/usr/share/java/${pkgname}
- install -Dm644 ${srcdir}/libs/*.jar ${pkgdir}/usr/share/java/$pkgname
- install -Dm644 ${srcdir}/antbuild/Cryptomator-${pkgver}.jar ${pkgdir}/usr/share/java/$pkgname/cryptomator.jar
+ install -Dm644 ${srcdir}/libs/*.jar ${pkgdir}/usr/share/java/${pkgname}
+ install -Dm644 ${srcdir}/antbuild/Cryptomator-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}/cryptomator.jar
install -Dm755 ${srcdir}/cryptomator.sh ${pkgdir}/usr/bin/cryptomator
install -Dm644 ${srcdir}/package/linux/Cryptomator.png ${pkgdir}/usr/share/java/${pkgname}
install -Dm644 ${srcdir}/cryptomator-vault.xml ${pkgdir}/usr/share/mime/packages/cryptomator-vault.xml
install -Dm644 ${srcdir}/cryptomator.desktop ${pkgdir}/usr/share/applications/cryptomator.desktop
+ install -Dm644 ${srcdir}/logback.xml ${pkgdir}/etc/${pkgname}/logback.xml
}
diff --git a/cryptomator.sh b/cryptomator.sh
index 6c3443f7227..c12342f7121 100644
--- a/cryptomator.sh
+++ b/cryptomator.sh
@@ -2,7 +2,7 @@
export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
exec /usr/bin/java \
-Xmx512m \
- -Dcryptomator.logPath=~/.Cryptomator/cryptomator.log \
- -Dcryptomator.upgradeLogPath=~/.Cryptomator/upgrade.log \
+ -Dlogback.configurationFile=/etc/cryptomator/logback.xml \
+ -Dcryptomator.ipcPortPath=~/.Cryptomator/ipcPort.bin \
-Dcryptomator.settingsPath=~/.Cryptomator/settings.json \
-jar /usr/share/java/cryptomator/cryptomator.jar "$@"
diff --git a/logback.xml b/logback.xml
new file mode 100644
index 00000000000..8107635a152
--- /dev/null
+++ b/logback.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xml>
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %highlight([%-5level]) %cyan(%logger{36}) - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${user.home}/.Cryptomator/cryptomator.log</file>
+ <append>false</append>
+ <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>${user.home}/.Cryptomator/cryptomator%i.log</fileNamePattern>
+ <minIndex>0</minIndex>
+ <maxIndex>9</maxIndex>
+ </rollingPolicy>
+ <triggeringPolicy class="org.cryptomator.logging.LaunchBasedTriggeringPolicy" />
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="UPGRADE_FILE" class="ch.qos.logback.core.FileAppender">
+ <file>${user.home}/.Cryptomator/upgrade.log</file>
+ <append>true</append>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.cryptomator" level="INFO" />
+ <logger name="org.eclipse.jetty.server.HttpChannel" level="INFO" />
+ <logger name="org.cryptomator.ui.model" level="INFO">
+ <appender-ref ref="UPGRADE_FILE" />
+ </logger>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+
+</configuration>