diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-11-23 11:46:47 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-11-23 11:46:47 +0200 |
commit | 2824873511f41b90ee6a546d1ebf5af2a6fdd294 (patch) | |
tree | 6db5c48a988b52c1dc7c0f0ecbc40705635c83be | |
parent | dc9ac5b58a0b41f3a424b267308eb925f01d6f48 (diff) | |
parent | 60929fb200748ef8aebcd3f2089ba1e1c0801941 (diff) | |
download | wekan-2824873511f41b90ee6a546d1ebf5af2a6fdd294.tar.gz wekan-2824873511f41b90ee6a546d1ebf5af2a6fdd294.tar.bz2 wekan-2824873511f41b90ee6a546d1ebf5af2a6fdd294.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 16 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
-rw-r--r-- | server/logger.js | 15 |
4 files changed, 23 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e10ea7cf..b1c27816 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.57 2017-11-23 Wekan release + +This release adds the following new features: + +* [Gogs Integration](https://github.com/wekan/wekan-gogs) as separate project. Please test and submit issues and pull requests to that project. + +and fixes the following bugs: + +* [Fix Winston logger](https://github.com/wekan/wekan/pull/1350). + +Thanks to GitHub users andresmanelli and pierreozoux for their contributions. + # v0.56 2017-11-21 Wekan release This release adds the following new features: @@ -10,9 +22,9 @@ and fixes the following bugs: * [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); * [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); -* [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). +* [Fix title editing with shift key at card details](https://github.com/wekan/wekan/pull/1348). -Thanks to GitHub users couscous3, GhassenRjab and thuanpq for their contributions. +Thanks to GitHub users couscous3, GhassenRjab, thuanpq and xet7 for their contributions. # v0.55 2017-11-19 Wekan release diff --git a/package.json b/package.json index 1da87726..65800aa1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.56.0", + "version": "0.57.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 8d0bed44..a49f6dea 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 42, + appVersion = 43, # Increment this for every release. - appMarketingVersion = (defaultText = "0.56.0~2017-11-21"), + appMarketingVersion = (defaultText = "0.57.0~2017-11-23"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/server/logger.js b/server/logger.js index 70caa292..cb06682f 100644 --- a/server/logger.js +++ b/server/logger.js @@ -3,21 +3,20 @@ Meteor.startup(() => { require('winston-zulip'); const fs = require('fs'); - const loggerEnable = process.env.LOGGER_ENABLE || false; + //remove default logger + Winston.remove(Winston.transports.Console); + + const loggerEnable = process.env.LOGGER_ENABLE || true; if (loggerEnable) { Winston.log('info', 'logger is enable'); - const loggers = process.env.LOGGERS.split(',') || 'console'; - Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); + const loggers = process.env.LOGGERS ? process.env.LOGGERS.split(',') : 'console'; if (loggers.includes('console')) { Winston.add(Winston.transports.Console, { json: true, timestamp: true, }); - } else { - //remove default logger - Winston.remove(Winston.transports.Console); } if (loggers.includes('file')) { @@ -57,10 +56,8 @@ Meteor.startup(() => { Winston.log('info', `zulipconfig ${zulipConfig}`); } - } else { - //remove default logger - Winston.remove(Winston.transports.Console); } + Winston.log('info', 'Logger is completly instanciate'); }); |