Minor refactoring

prebid · Jun 2, 2021 · 697a991 · 697a991
1 parent 0e87b44
commit 697a991
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/exchange/exchange.go b/exchange/exchange.go
@@ -159,13 +159,13 @@ func (e *exchange) HoldAuction(ctx context.Context, r AuctionRequest, debugLog *
 	}
 
 	if debugLog == nil {
-		debugLog = &DebugLog{Enabled: false}
+		debugLog = &DebugLog{Enabled: false, DebugEnabledOrOverridden: false}
 	}
 
 	requestDebugInfo := getDebugInfo(r.BidRequest, requestExt)
 
-	debugInfo := debugLog.DebugOverride || (requestDebugInfo && r.Account.DebugAllow)
-	debugLog.Enabled = debugLog.DebugOverride || (debugLog.Enabled && r.Account.DebugAllow)
+	debugInfo := debugLog.DebugEnabledOrOverridden || (requestDebugInfo && r.Account.DebugAllow)
+	debugLog.Enabled = debugLog.DebugEnabledOrOverridden || r.Account.DebugAllow
 
 	if debugInfo {
 		ctx = e.makeDebugContext(ctx, debugInfo)

diff --git a/exchange/exchange_test.go b/exchange/exchange_test.go
@@ -346,7 +346,7 @@ func TestDebugBehaviour(t *testing.T) {
 		}
 		debugLog := &DebugLog{}
 		if test.debugData.headerOverrideDebugAllowed {
-			debugLog = &DebugLog{DebugOverride: true}
+			debugLog = &DebugLog{DebugOverride: true, DebugEnabledOrOverridden: true}
 		}
 		// Run test
 		outBidResponse, err := e.HoldAuction(ctx, auctionRequest, debugLog)