Pārlūkot izejas kodu

HUE-3923 [core] Simplify force debug logic option

Romain Rigaux 9 gadi atpakaļ
vecāks
revīzija
6db38b4

+ 3 - 4
desktop/core/src/desktop/log/__init__.py

@@ -202,14 +202,13 @@ def fancy_logging():
 
 
 def get_all_debug():
-  from desktop.settings import ENV_DESKTOP_DEBUG # Circular dependency
   global FORCE_DEBUG
 
-  return FORCE_DEBUG or os.getenv(ENV_DESKTOP_DEBUG) != None
+  return FORCE_DEBUG
 
 
 def set_all_debug():
-  from desktop.settings import ENV_DESKTOP_DEBUG, ENV_HUE_PROCESS_NAME # Circular dependency
+  from desktop.settings import ENV_HUE_PROCESS_NAME # Circular dependency
   global FORCE_DEBUG
 
   FORCE_DEBUG = True
@@ -218,7 +217,7 @@ def set_all_debug():
 
 
 def reset_all_debug():
-  from desktop.settings import ENV_DESKTOP_DEBUG, ENV_HUE_PROCESS_NAME # Circular dependency
+  from desktop.settings import ENV_HUE_PROCESS_NAME # Circular dependency
   global FORCE_DEBUG
 
   FORCE_DEBUG = False

+ 5 - 5
desktop/core/src/desktop/templates/logs.mako

@@ -100,9 +100,9 @@ ${layout.menubar(section='log_view')}
     var self = this;
 
     self.forcedDebug = ko.observable();
-    self.forcedDebug.subscribe(function(newValue) {
-      if (newValue != null) {
-        self.toggleLogLevel();
+    self.forcedDebug.subscribe(function(oldValue) {
+      if (oldValue != null) {
+        self.setLogLevel(! oldValue);
       }
     }, this, "beforeChange");
 
@@ -110,9 +110,9 @@ ${layout.menubar(section='log_view')}
       $.get("/desktop/get_debug_level", function(data) { self.forcedDebug(data.debug_all); });
     };
 
-    self.toggleLogLevel = function() {
+    self.setLogLevel = function(set_debug) {
       var _url = "";
-      if (self.forcedDebug()) {
+      if (set_debug) {
         _url = "/desktop/set_all_debug";
       } else {
         _url = "/desktop/reset_all_debug";