self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Merge branch 'release-1.0' into dev

Browse Source
This commit is contained in:
Laurent Cozic
2020-09-09 13:59:36 +01:00
parent 5fe3732a38 2aa7eaa192
commit 5f410e80e6
11 changed files with 293 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/BaseApplication.js
View File

@ -44,6 +44,9 @@ const KvStore = require('lib/services/KvStore');
const MigrationService = require('lib/services/MigrationService');
const { toSystemSlashes } = require('lib/path-utils.js');
const ntpClient = require('lib/vendor/ntp-client');
ntpClient.dgram = require('dgram');
class BaseApplication {
constructor() {
this.logger_ = new Logger();
@ -673,6 +676,7 @@ class BaseApplication {
reg.dispatch = () => {};
BaseService.logger_ = this.logger_;
require('lib/ntpDate').setLogger(reg.logger());
this.dbLogger_.addTarget('file', { path: `${profileDir}/log-database.txt` });
this.dbLogger_.setLevel(initArgs.logLevel);