From 22ec855caaaa24f223ffd3cd6b61ce035bf985c7 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mcooper@mozilla.com>
Date: Wed, 29 Mar 2017 13:49:37 -0700
Subject: [PATCH] Bug 1351465 - shield-recipe-client: Unconditionally set up
 logging in bootstrap r=Gijs

MozReview-Commit-ID: 5W7UdpsLyYd

--HG--
extra : rebase_source : 446933ac19330b2404f453b91c09b8bb83e191d0
---
 browser/extensions/shield-recipe-client/bootstrap.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/extensions/shield-recipe-client/bootstrap.js b/browser/extensions/shield-recipe-client/bootstrap.js
index 625c1318d74e..00606f2c074a 100644
--- a/browser/extensions/shield-recipe-client/bootstrap.js
+++ b/browser/extensions/shield-recipe-client/bootstrap.js
@@ -57,10 +57,6 @@ this.install = function() {
 this.startup = function() {
   setDefaultPrefs();
 
-  if (!shouldRun) {
-    return;
-  }
-
   // Setup logging and listen for changes to logging prefs
   LogManager.configure(Services.prefs.getIntPref(PREF_LOGGING_LEVEL));
   log = LogManager.getLogger("bootstrap");
@@ -68,6 +64,10 @@ this.startup = function() {
   CleanupManager.addCleanupHandler(
     () => Preferences.ignore(PREF_LOGGING_LEVEL, LogManager.configure));
 
+  if (!shouldRun) {
+    return;
+  }
+
   RecipeRunner.init();
 };