trilium-server: Patch logger to use console instead of rolling files

This commit is contained in:
Christian Kampka 2019-12-09 19:44:46 +01:00
parent a84c8599b3
commit 1f060b43a6
No known key found for this signature in database
GPG Key ID: B88E140DB4FE1AA5
2 changed files with 71 additions and 0 deletions

View File

@ -0,0 +1,69 @@
From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Mon, 9 Dec 2019 19:40:27 +0100
Subject: [PATCH] Use console logger instead of rolling files
---
src/services/log.js | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/services/log.js b/src/services/log.js
index 1514c209..456c3749 100644
--- a/src/services/log.js
+++ b/src/services/log.js
@@ -1,35 +1,15 @@
"use strict";
-const fs = require('fs');
-const dataDir = require('./data_dir');
-
-if (!fs.existsSync(dataDir.LOG_DIR)) {
- fs.mkdirSync(dataDir.LOG_DIR, 0o700);
-}
-
-const logger = require('simple-node-logger').createRollingFileLogger({
- errorEventName: 'error',
- logDirectory: dataDir.LOG_DIR,
- fileNamePattern: 'trilium-<DATE>.log',
- dateFormat:'YYYY-MM-DD'
-});
-
function info(message) {
// info messages are logged asynchronously
setTimeout(() => {
console.log(message);
-
- logger.info(message);
}, 0);
}
function error(message) {
message = "ERROR: " + message;
- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError()
- // errors are logged synchronously to make sure it doesn't get lost in case of crash
- logger.info(message);
-
console.trace(message);
}
@@ -45,12 +25,12 @@ function request(req) {
if (req.url.includes(".js.map") || req.url.includes(".css.map")) {
return;
}
-
- logger.info(req.method + " " + req.url);
+ if(process.env.DEBUG)
+ console.log(req.method + " " + req.url);
}
module.exports = {
info,
error,
request
-};
\ No newline at end of file
+};
--
2.23.0

View File

@ -20,6 +20,7 @@ let
}; };
version = "0.37.8"; version = "0.37.8";
in { in {
trilium-desktop = stdenv.mkDerivation rec { trilium-desktop = stdenv.mkDerivation rec {
@ -90,6 +91,7 @@ in {
libxkbfile libxkbfile
]; ];
patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ;
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/share/trilium-server mkdir -p $out/share/trilium-server