fix(multiaccounts/login): ensure log-level is updated correctly

As reported in #10127 there's an issue that the log level isn't properly
applied when changed through log settings UI.

Turned out that we're setting the log-level only once in the entire
lifetime of the application and that is during bootstrap.
When the log level is changed through the UI, we never actually update
the log level in the logger module.

To fix this, we just need to ensure that, whenever the log-level is changed,
we also call `log/set-level!` with the new level.

It should also be noted that, every time the log level is changed through
the UI, the user is logged out, so one place to update the logger is
after very successful login.

Fixes #10127

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Pascal Precht 2020-04-27 10:16:07 +02:00 committed by Andrey Shovkoplyas
parent 6274a1a3af
commit d26a9e2529
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 19 additions and 2 deletions

View File

@ -25,6 +25,7 @@
[status-im.utils.handlers :as handlers] [status-im.utils.handlers :as handlers]
[status-im.utils.identicon :as identicon] [status-im.utils.identicon :as identicon]
[status-im.utils.keychain.core :as keychain] [status-im.utils.keychain.core :as keychain]
[status-im.utils.logging.core :as logging]
[status-im.utils.platform :as platform] [status-im.utils.platform :as platform]
[status-im.utils.security :as security] [status-im.utils.security :as security]
[status-im.utils.types :as types] [status-im.utils.types :as types]
@ -210,6 +211,7 @@
(contact/initialize-contacts) (contact/initialize-contacts)
(stickers/init-stickers-packs) (stickers/init-stickers-packs)
(mobile-network/on-network-status-change) (mobile-network/on-network-status-change)
(logging/set-log-level multiaccount)
(multiaccounts/switch-preview-privacy-mode-flag)))) (multiaccounts/switch-preview-privacy-mode-flag))))
(defn get-new-auth-method [auth-method save-password?] (defn get-new-auth-method [auth-method save-password?]
@ -270,6 +272,7 @@
:mailserver-topics {} :mailserver-topics {}
:default-mailserver true}) :default-mailserver true})
(multiaccounts/switch-preview-privacy-mode-flag) (multiaccounts/switch-preview-privacy-mode-flag)
(logging/set-log-level multiaccount)
(when-not platform/desktop? (when-not platform/desktop?
(initialize-wallet accounts nil))))) (initialize-wallet accounts nil)))))

View File

@ -487,8 +487,7 @@
:log-level/current-log-level :log-level/current-log-level
:<- [:multiaccount] :<- [:multiaccount]
(fn [multiaccount] (fn [multiaccount]
(or (get multiaccount :log-level) (get multiaccount :log-level)))
config/log-level-status-go)))
(re-frame/reg-sub (re-frame/reg-sub
:waku/enabled :waku/enabled

View File

@ -42,6 +42,21 @@
(get-js-logs) (get-js-logs)
#(re-frame/dispatch [callback-handler %])))) #(re-frame/dispatch [callback-handler %]))))
(re-frame/reg-fx
:logs/set-level
(fn [log-level]
(log/set-level! log-level)))
(fx/defn set-log-level
[{:keys [db]} multiaccount]
(let [log-level (if-let [level (get multiaccount :log-level)]
(if (clojure.string/blank? level) "ERROR" level)
config/log-level-status-go)]
{:db (assoc-in db [:multiaccount :log-level] log-level)
:logs/set-level (-> log-level
clojure.string/lower-case
keyword)}))
(fx/defn send-logs (fx/defn send-logs
[{:keys [db]}] [{:keys [db]}]
;; TODO: Add message explaining db export ;; TODO: Add message explaining db export