From e12a09980f9dbe0136611201546890c88179d91d Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 26 May 2021 18:33:57 -0300 Subject: [PATCH 1/3] chore(version-snjs): 2.4.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ae9f6e99e..0186aef77 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.3.1", + "@standardnotes/snjs": "2.4.2", "mobx": "^6.1.6", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index 2ce16916e..2c9d723f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,10 +1936,10 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.3.1.tgz#48b68050ac4c4616bebab0128fd093cad0d65ea7" - integrity sha512-PTWt5R4OTrbyMKX8eTr/fc6Z0o4WrOJucDfMUWBQeIajHQg7V3MHpp0PArz+SS1Qdj3n7eVdl5qyHFjymL3C/w== +"@standardnotes/snjs@2.4.2": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.4.2.tgz#5d3dfd6ae5f40984e0d28b776684561b5818eadf" + integrity sha512-/R8Lsbo9NqQ2FZKe4N4V4ZQxUbfmzU5jA6FtW0wE+g6c5MtHPO9fRoWK81PJXumc+t9VI8q2nswkthyqIGgEgA== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9" From bab6d2ebbf275476af68a0baa30af2faea351010 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 26 May 2021 18:34:32 -0300 Subject: [PATCH 2/3] chore(version): 3.7.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0186aef77..10df113dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.7.0", + "version": "3.7.1", "license": "AGPL-3.0-or-later", "repository": { "type": "git", From 737550096e88d68f700185b325278a7b02a9e7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 28 May 2021 11:37:08 +0200 Subject: [PATCH 3/3] feat: add configurable log level --- .env.sample | 2 ++ config/environments/production.rb | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.sample b/.env.sample index cb3d1bc49..f37bb8833 100644 --- a/.env.sample +++ b/.env.sample @@ -2,6 +2,8 @@ RAILS_ENV=development PORT=3001 WEB_CONCURRENCY=0 RAILS_LOG_TO_STDOUT=true +# Log Level options: "INFO" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL" +RAILS_LOG_LEVEL=INFO RAILS_SERVE_STATIC_FILES=true SECRET_KEY_BASE=test APP_HOST=http://localhost:3001 diff --git a/config/environments/production.rb b/config/environments/production.rb index dd385facf..a03ef162b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -11,6 +11,8 @@ Rails.application.configure do config.logger = ActiveSupport::Logger.new(STDOUT) end + config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'INFO').to_sym + config.colorize_logging = false config.logger.formatter = StandardNotesFormatter.new @@ -64,10 +66,6 @@ Rails.application.configure do # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :info - # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ]