Skip to content

Extract printing debug info from ldp to config module #1126

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
merged 1 commit into from
Mar 7, 2019
Merged

Extract printing debug info from ldp to config module #1126

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
2 changes: 2 additions & 0 deletions lib/create-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ function createApp (argv = {}) {
const configPath = config.initConfigDir(argv)
argv.templates = config.initTemplateDirs(configPath)

config.printDebugInfo(argv)

const ldp = new LDP(argv)

const app = express()
Expand Down
15 changes: 0 additions & 15 deletions lib/ldp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,6 @@ class LDP {
this.corsProxy = '/' + this.corsProxy
}

debug.settings('Server URI: ' + this.serverUri)
debug.settings('Auth method: ' + this.auth)
debug.settings('Strict origins: ' + this.strictOrigin)
debug.settings('Allowed origins: ' + this.trustedOrigins)
debug.settings('Db path: ' + this.dbPath)
debug.settings('Config path: ' + this.configPath)
debug.settings('Suffix Acl: ' + this.suffixAcl)
debug.settings('Suffix Meta: ' + this.suffixMeta)
debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper.rootPath : 'none'))
debug.settings('Allow WebID authentication: ' + !!this.webid)
debug.settings('Live-updates: ' + !!this.live)
debug.settings('Multi-user: ' + !!this.multiuser)
debug.settings('Suppress default data browser app: ' + this.suppressDataBrowser)
debug.settings('Default data browser app file path: ' + this.dataBrowserPath)

return this
}

Expand Down
22 changes: 21 additions & 1 deletion lib/server-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@ const path = require('path')
const templateUtils = require('./common/template-utils')
const fsUtils = require('./common/fs-utils')

const debug = require('./debug')

function printDebugInfo (options) {
debug.settings('Server URI: ' + options.serverUri)
debug.settings('Auth method: ' + options.auth)
debug.settings('Strict origins: ' + options.strictOrigin)
debug.settings('Allowed origins: ' + options.trustedOrigins)
debug.settings('Db path: ' + options.dbPath)
debug.settings('Config path: ' + options.configPath)
debug.settings('Suffix Acl: ' + options.suffixAcl)
debug.settings('Suffix Meta: ' + options.suffixMeta)
debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper.rootPath : 'none'))
debug.settings('Allow WebID authentication: ' + !!options.webid)
debug.settings('Live-updates: ' + !!options.live)
debug.settings('Multi-user: ' + !!options.multiuser)
debug.settings('Suppress default data browser app: ' + options.suppressDataBrowser)
debug.settings('Default data browser app file path: ' + options.dataBrowserPath)
}

/**
* Ensures that a directory has been copied / initialized. Used to ensure that
* account templates, email templates and default apps have been copied from
Expand Down Expand Up @@ -144,5 +163,6 @@ module.exports = {
ensureWelcomePage,
initConfigDir,
initDefaultViews,
initTemplateDirs
initTemplateDirs,
printDebugInfo
}