From 3d89143d727b070d6ae989aa83e7ba101eb320ef Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Tue, 14 Nov 2017 16:18:15 +0100 Subject: [PATCH] set log level from .env configuration --- .env | 1 + .env.jenkins | 1 + .env.prod | 1 + src/status_im/android/core.cljs | 8 +++----- src/status_im/core.cljs | 15 +++++++++++++++ src/status_im/ios/core.cljs | 8 +++----- src/status_im/utils/config.cljs | 7 ++++++- 7 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 src/status_im/core.cljs diff --git a/.env b/.env index f6eea46dd3..dec88eec0b 100644 --- a/.env +++ b/.env @@ -4,3 +4,4 @@ DEBUG_LOGS_ENABLED=1 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 +LOG_LEVEL=debug diff --git a/.env.jenkins b/.env.jenkins index be91f591e4..a70e32ee71 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -4,3 +4,4 @@ DEBUG_LOGS_ENABLED=1 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 +LOG_LEVEL=debug diff --git a/.env.prod b/.env.prod index e8af82def1..db98088ee9 100644 --- a/.env.prod +++ b/.env.prod @@ -4,3 +4,4 @@ DEBUG_LOGS_ENABLED=0 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=0 MAINNET_NETWORKS_ENABLED=0 +LOG_LEVEL=info diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index 439fa8e7be..f289a24192 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -12,7 +12,8 @@ [status-im.utils.error-handler :as error-handler] [status-im.utils.utils :as utils] [status-im.utils.config :as config] - [status-im.utils.notifications :as notifications])) + [status-im.utils.notifications :as notifications] + [status-im.core :as core])) (defn init-back-button-handler! [] (let [new-listener (fn [] @@ -79,9 +80,6 @@ :reagent-render views/main}))) (defn init [] - (error-handler/register-exception-handler!) - (status/init-jail) - (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)) (status/set-soft-input-mode status/adjust-resize) (init-back-button-handler!) - (dispatch-sync [:initialize-app])) + (core/init app-root)) diff --git a/src/status_im/core.cljs b/src/status_im/core.cljs new file mode 100644 index 0000000000..651c1034fd --- /dev/null +++ b/src/status_im/core.cljs @@ -0,0 +1,15 @@ +(ns status-im.core + (:require [status-im.utils.error-handler :as error-handler] + [status-im.ui.components.react :as react] + [re-frame.core :as re-frame] + [reagent.core :as reagent] + [status-im.native-module.core :as status] + [taoensso.timbre :as log] + [status-im.utils.config :as config])) + +(defn init [app-root] + (log/set-level! config/log-level) + (error-handler/register-exception-handler!) + (status/init-jail) + (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)) + (re-frame/dispatch-sync [:initialize-app])) diff --git a/src/status_im/ios/core.cljs b/src/status_im/ios/core.cljs index 7e3f37eec2..010dee360f 100644 --- a/src/status_im/ios/core.cljs +++ b/src/status_im/ios/core.cljs @@ -12,7 +12,8 @@ [status-im.utils.error-handler :as error-handler] [status-im.utils.utils :as utils] [status-im.utils.config :as config] - [status-im.utils.notifications :as notifications])) + [status-im.utils.notifications :as notifications] + [status-im.core :as core])) (defn orientation->keyword [o] (keyword (.toLowerCase o))) @@ -53,7 +54,4 @@ :reagent-render views/main}))) (defn init [] - (error-handler/register-exception-handler!) - (status/init-jail) - (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)) - (dispatch-sync [:initialize-app])) + (core/init app-root)) diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index 2e53aa62ae..bad27f0978 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -1,5 +1,6 @@ (ns status-im.utils.config - (:require [status-im.react-native.js-dependencies :as rn-dependencies])) + (:require [status-im.react-native.js-dependencies :as rn-dependencies] + [clojure.string :as string])) (def config (js->clj (.-default rn-dependencies/config) :keywordize-keys true)) @@ -20,4 +21,8 @@ (def notifications-wip-enabled? (enabled? (get-config :NOTIFICATIONS_WIP_ENABLED 0))) (def stub-status-go? (enabled? (get-config :STUB_STATUS_GO 0))) (def mainnet-networks-enabled? (enabled? (get-config :MAINNET_NETWORKS_ENABLED 0))) +(def log-level + (-> (get-config :LOG_LEVEL "error") + string/lower-case + keyword))