1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

fix formatting (resolve merge conflict)

This commit is contained in:
Steve-Mcl 2022-06-09 22:29:28 +01:00
parent d4e6136b09
commit 1b4f2b9c53

View File

@ -250,18 +250,18 @@ module.exports = {
* - externalModules * - externalModules
******************************************************************************/ ******************************************************************************/
/** Uncomment the following to run node-red in your preferred language. /** Uncomment the following to run node-red in your preferred language.
* Available languages include: en-US (default), ja, de, zh-CN, zh-TW, ru, ko * Available languages include: en-US (default), ja, de, zh-CN, zh-TW, ru, ko
* Some languages are more complete than others. * Some languages are more complete than others.
*/ */
// lang: "de", // lang: "de",
/** Configure diagnostics options /** Configure diagnostics options
* - enabled: When `enabled` is `true` (or unset), diagnostics data will * - enabled: When `enabled` is `true` (or unset), diagnostics data will
* be available at http://localhost:1880/diagnostics * be available at http://localhost:1880/diagnostics
* - ui: When `ui` is `true` (or unset), the action `show-system-info` will * - ui: When `ui` is `true` (or unset), the action `show-system-info` will
* be available to logged in users of node-red editor * be available to logged in users of node-red editor
*/ */
diagnostics: { diagnostics: {
/** enable or disable diagnostics endpoint. Must be set to `false` to disable */ /** enable or disable diagnostics endpoint. Must be set to `false` to disable */
enabled: true, enabled: true,
@ -281,74 +281,74 @@ module.exports = {
/** show or hide runtime stop/start options in the node-red editor. Must be set to `false` to hide */ /** show or hide runtime stop/start options in the node-red editor. Must be set to `false` to hide */
ui: true, ui: true,
}, },
/** Configure the logging output */ /** Configure the logging output */
logging: { logging: {
/** Only console logging is currently supported */ /** Only console logging is currently supported */
console: { console: {
/** Level of logging to be recorded. Options are: /** Level of logging to be recorded. Options are:
* fatal - only those errors which make the application unusable should be recorded * fatal - only those errors which make the application unusable should be recorded
* error - record errors which are deemed fatal for a particular request + fatal errors * error - record errors which are deemed fatal for a particular request + fatal errors
* warn - record problems which are non fatal + errors + fatal errors * warn - record problems which are non fatal + errors + fatal errors
* info - record information about the general running of the application + warn + error + fatal errors * info - record information about the general running of the application + warn + error + fatal errors
* debug - record information which is more verbose than info + info + warn + error + fatal errors * debug - record information which is more verbose than info + info + warn + error + fatal errors
* trace - record very detailed logging + debug + info + warn + error + fatal errors * trace - record very detailed logging + debug + info + warn + error + fatal errors
* off - turn off all logging (doesn't affect metrics or audit) * off - turn off all logging (doesn't affect metrics or audit)
*/ */
level: "info", level: "info",
/** Whether or not to include metric events in the log output */ /** Whether or not to include metric events in the log output */
metrics: false, metrics: false,
/** Whether or not to include audit events in the log output */ /** Whether or not to include audit events in the log output */
audit: false audit: false
} }
}, },
/** Context Storage /** Context Storage
* The following property can be used to enable context storage. The configuration * The following property can be used to enable context storage. The configuration
* provided here will enable file-based context that flushes to disk every 30 seconds. * provided here will enable file-based context that flushes to disk every 30 seconds.
* Refer to the documentation for further options: https://nodered.org/docs/api/context/ * Refer to the documentation for further options: https://nodered.org/docs/api/context/
*/ */
//contextStorage: { //contextStorage: {
// default: { // default: {
// module:"localfilesystem" // module:"localfilesystem"
// }, // },
//}, //},
/** `global.keys()` returns a list of all properties set in global context. /** `global.keys()` returns a list of all properties set in global context.
* This allows them to be displayed in the Context Sidebar within the editor. * This allows them to be displayed in the Context Sidebar within the editor.
* In some circumstances it is not desirable to expose them to the editor. The * In some circumstances it is not desirable to expose them to the editor. The
* following property can be used to hide any property set in `functionGlobalContext` * following property can be used to hide any property set in `functionGlobalContext`
* from being list by `global.keys()`. * from being list by `global.keys()`.
* By default, the property is set to false to avoid accidental exposure of * By default, the property is set to false to avoid accidental exposure of
* their values. Setting this to true will cause the keys to be listed. * their values. Setting this to true will cause the keys to be listed.
*/ */
exportGlobalContextKeys: false, exportGlobalContextKeys: false,
/** Configure how the runtime will handle external npm modules. /** Configure how the runtime will handle external npm modules.
* This covers: * This covers:
* - whether the editor will allow new node modules to be installed * - whether the editor will allow new node modules to be installed
* - whether nodes, such as the Function node are allowed to have their * - whether nodes, such as the Function node are allowed to have their
* own dynamically configured dependencies. * own dynamically configured dependencies.
* The allow/denyList options can be used to limit what modules the runtime * The allow/denyList options can be used to limit what modules the runtime
* will install/load. It can use '*' as a wildcard that matches anything. * will install/load. It can use '*' as a wildcard that matches anything.
*/ */
externalModules: { externalModules: {
// autoInstall: false, /** Whether the runtime will attempt to automatically install missing modules */ // autoInstall: false, /** Whether the runtime will attempt to automatically install missing modules */
// autoInstallRetry: 30, /** Interval, in seconds, between reinstall attempts */ // autoInstallRetry: 30, /** Interval, in seconds, between reinstall attempts */
// palette: { /** Configuration for the Palette Manager */ // palette: { /** Configuration for the Palette Manager */
// allowInstall: true, /** Enable the Palette Manager in the editor */ // allowInstall: true, /** Enable the Palette Manager in the editor */
// allowUpdate: true, /** Allow modules to be updated in the Palette Manager */ // allowUpdate: true, /** Allow modules to be updated in the Palette Manager */
// allowUpload: true, /** Allow module tgz files to be uploaded and installed */ // allowUpload: true, /** Allow module tgz files to be uploaded and installed */
// allowList: ['*'], // allowList: ['*'],
// denyList: [], // denyList: [],
// allowUpdateList: ['*'], // allowUpdateList: ['*'],
// denyUpdateList: [] // denyUpdateList: []
// }, // },
// modules: { /** Configuration for node-specified modules */ // modules: { /** Configuration for node-specified modules */
// allowInstall: true, // allowInstall: true,
// allowList: [], // allowList: [],
// denyList: [] // denyList: []
// } // }
}, },
/******************************************************************************* /*******************************************************************************