Skip to content

fix: use configured log level even if window._oc_debug is set #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 1 commit into from
Nov 7, 2025
Merged

fix: use configured log level even if window._oc_debug is set #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lib/LoggerBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,8 @@ export class LoggerBuilder {
const onLoaded = () => {
if (document.readyState === 'complete' || (document.readyState === 'interactive')) {
// Up to, including, nextcloud 24 the loglevel was not exposed
self.context.level = window._oc_config?.loglevel ?? LogLevel.Warn
// Override loglevel if we are in debug mode
if (window._oc_debug) {
self.context.level = LogLevel.Debug
}
const fallback = window._oc_debug ? LogLevel.Debug : LogLevel.Warn
self.context.level = window._oc_config?.loglevel ?? fallback
document.removeEventListener('readystatechange', onLoaded)
} else {
document.addEventListener('readystatechange', onLoaded)
Expand Down
21 changes: 2 additions & 19 deletions tests/LoggerBuilder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ describe('detect logging level', () => {
expect(logger.context.level).toBe(window._oc_config.loglevel)
})

it('with `_oc_debug` override', async () => {
it('does not override based on `_oc_debug` anymore', async () => {
setReadyState('loading')
const builder = getLoggerBuilder()
builder.detectLogLevel()
Expand All @@ -139,26 +139,9 @@ describe('detect logging level', () => {

// Level should now be set to configured one
expect('level' in builder.getContext()).toBe(true)
expect(builder.getContext().level).toBe(LogLevel.Debug)
expect(builder.getContext().level).toBe(window._oc_config.loglevel)
})

it('with `_oc_debug` override on HTML interactive phase', async () => {
setReadyState('loading')
const builder = getLoggerBuilder()
builder.detectLogLevel()

// Still loading so no level set
expect('level' in builder.getContext()).toBe(false)

// Trigger document loaded
window._oc_debug = true
setReadyState('interactive')
await new Promise(process.nextTick)

// Level should now be set to configured one
expect('level' in builder.getContext()).toBe(true)
expect(builder.getContext().level).toBe(LogLevel.Debug)
})
})
})

Expand Down