Merge pull request #14854 from intercom/gj/debug-only-log-active-gene…

…ration [BUGFIX beta] only `LOG_ACTIVE_GENERATION` and `LOG_RESOLVER` in debug
emberjs · Jan 20, 2017 · 9d23667 · 9d23667
2 parents 3c8a569 + 1e71e0c
commit 9d23667
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/packages/ember-application/lib/system/resolver.js b/packages/ember-application/lib/system/resolver.js
@@ -4,7 +4,12 @@
 */
 
 import { dictionary } from 'ember-utils';
-import { assert, info, get } from 'ember-metal';
+import {
+  assert,
+  info,
+  get,
+  runInDebug
+} from 'ember-metal';
 import {
   String as StringUtils,
   Object as EmberObject,
@@ -171,9 +176,11 @@ export default EmberObject.extend({
 
     resolved = resolved || this.resolveOther(parsedName);
 
-    if (parsedName.root && parsedName.root.LOG_RESOLVER) {
-      this._logLookup(resolved, parsedName);
-    }
+    runInDebug(() => {
+      if (parsedName.root && parsedName.root.LOG_RESOLVER) {
+        this._logLookup(resolved, parsedName);
+      }
+    });
 
     if (resolved) {
       validateType(resolved, parsedName);

diff --git a/packages/ember-routing/lib/system/generate_controller.js b/packages/ember-routing/lib/system/generate_controller.js
@@ -1,6 +1,7 @@
 import {
   info,
-  get
+  get,
+  runInDebug
 } from 'ember-metal';
 import { FACTORY_FOR } from 'container';
 
@@ -48,9 +49,11 @@ export default function generateController(owner, controllerName) {
   let fullName = `controller:${controllerName}`;
   let instance = owner.lookup(fullName);
 
-  if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
-    info(`generated -> ${fullName}`, { fullName });
-  }
+  runInDebug(() => {
+    if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
+      info(`generated -> ${fullName}`, { fullName });
+    }
+  });
 
   return instance;
 }
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
@@ -602,9 +602,11 @@ const EmberRouter = EmberObject.extend(Evented, {
         routeOwner.register(fullRouteName, DefaultRoute.extend());
         handler = routeOwner.lookup(fullRouteName);
 
-        if (get(this, 'namespace.LOG_ACTIVE_GENERATION')) {
-          info(`generated -> ${fullRouteName}`, { fullName: fullRouteName });
-        }
+        runInDebug(() => {
+          if (get(this, 'namespace.LOG_ACTIVE_GENERATION')) {
+            info(`generated -> ${fullRouteName}`, { fullName: fullRouteName });
+          }
+        });
       }
 
       handler._setRouteName(routeName);