exposed logger as node module

This commit is contained in:
Felix Wiedenbach 2021-02-18 19:14:53 +01:00
parent 09ddd3d925
commit b18d98f5ea
14 changed files with 21 additions and 18 deletions

View File

@ -33,6 +33,7 @@ _This release is scheduled to be released on 2021-04-01._
- Bump electron to v11. - Bump electron to v11.
- Dont update the DOM when a module is not displayed. - Dont update the DOM when a module is not displayed.
- Cleaned up jsdoc and tests. - Cleaned up jsdoc and tests.
- Exposed logger as node module for easier access for 3rd party modules
### Removed ### Removed

View File

@ -4,16 +4,17 @@
* By Michael Teeuw https://michaelteeuw.nl * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed. * MIT Licensed.
*/ */
const fs = require("fs");
const path = require("path");
const Log = require(`${__dirname}/logger`);
const Server = require(`${__dirname}/server`);
const Utils = require(`${__dirname}/utils`);
const defaultModules = require(`${__dirname}/../modules/default/defaultmodules`);
// Alias modules mentioned in package.js under _moduleAliases. // Alias modules mentioned in package.js under _moduleAliases.
require("module-alias/register"); require("module-alias/register");
const fs = require("fs");
const path = require("path");
const Log = require("logger");
const Server = require(`${__dirname}/server`);
const Utils = require(`${__dirname}/utils`);
const defaultModules = require(`${__dirname}/../modules/default/defaultmodules`);
// Get version number. // Get version number.
global.version = require(`${__dirname}/../package.json`).version; global.version = require(`${__dirname}/../package.json`).version;
Log.log("Starting MagicMirror: v" + global.version); Log.log("Starting MagicMirror: v" + global.version);

View File

@ -2,7 +2,7 @@
const electron = require("electron"); const electron = require("electron");
const core = require("./app.js"); const core = require("./app.js");
const Log = require("./logger.js"); const Log = require("logger");
// Config // Config
let config = process.env.config ? JSON.parse(process.env.config) : {}; let config = process.env.config ? JSON.parse(process.env.config) : {};

View File

@ -5,7 +5,7 @@
* MIT Licensed. * MIT Licensed.
*/ */
const Class = require("./class.js"); const Class = require("./class.js");
const Log = require("./logger.js"); const Log = require("logger");
const express = require("express"); const express = require("express");
const NodeHelper = Class.extend({ const NodeHelper = Class.extend({

View File

@ -11,7 +11,7 @@ const ipfilter = require("express-ipfilter").IpFilter;
const fs = require("fs"); const fs = require("fs");
const helmet = require("helmet"); const helmet = require("helmet");
const Log = require("./logger.js"); const Log = require("logger");
const Utils = require("./utils.js"); const Utils = require("./utils.js");
/** /**

View File

@ -4,7 +4,7 @@
* By Michael Teeuw https://michaelteeuw.nl * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed. * MIT Licensed.
*/ */
const Log = require("../../../js/logger.js"); const Log = require("logger");
const ical = require("node-ical"); const ical = require("node-ical");
const request = require("request"); const request = require("request");

View File

@ -7,7 +7,7 @@
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const validUrl = require("valid-url"); const validUrl = require("valid-url");
const CalendarFetcher = require("./calendarfetcher.js"); const CalendarFetcher = require("./calendarfetcher.js");
const Log = require("../../../js/logger"); const Log = require("logger");
module.exports = NodeHelper.create({ module.exports = NodeHelper.create({
// Override start method. // Override start method.

View File

@ -1,5 +1,5 @@
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const Log = require("../../../js/logger"); const Log = require("logger");
module.exports = NodeHelper.create({ module.exports = NodeHelper.create({
// Override start method. // Override start method.

View File

@ -4,7 +4,7 @@
* By Michael Teeuw https://michaelteeuw.nl * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed. * MIT Licensed.
*/ */
const Log = require("../../../js/logger.js"); const Log = require("logger");
const FeedMe = require("feedme"); const FeedMe = require("feedme");
const request = require("request"); const request = require("request");
const iconv = require("iconv-lite"); const iconv = require("iconv-lite");

View File

@ -8,7 +8,7 @@
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const validUrl = require("valid-url"); const validUrl = require("valid-url");
const NewsfeedFetcher = require("./newsfeedfetcher.js"); const NewsfeedFetcher = require("./newsfeedfetcher.js");
const Log = require("../../../js/logger"); const Log = require("logger");
module.exports = NodeHelper.create({ module.exports = NodeHelper.create({
// Override start method. // Override start method.

View File

@ -3,7 +3,7 @@ const simpleGits = [];
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
const defaultModules = require(__dirname + "/../defaultmodules.js"); const defaultModules = require(__dirname + "/../defaultmodules.js");
const Log = require(__dirname + "/../../../js/logger.js"); const Log = require("logger");
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
module.exports = NodeHelper.create({ module.exports = NodeHelper.create({

View File

@ -1,5 +1,5 @@
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const Log = require("../../../js/logger"); const Log = require("logger");
module.exports = NodeHelper.create({ module.exports = NodeHelper.create({
// Override start method. // Override start method.

View File

@ -89,7 +89,8 @@
"valid-url": "^1.0.9" "valid-url": "^1.0.9"
}, },
"_moduleAliases": { "_moduleAliases": {
"node_helper": "js/node_helper.js" "node_helper": "js/node_helper.js",
"logger": "js/logger.js"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=10"

View File

@ -1,5 +1,5 @@
const app = require("../js/app.js"); const app = require("../js/app.js");
const Log = require("../js/logger.js"); const Log = require("logger");
app.start(function (config) { app.start(function (config) {
var bindAddress = config.address ? config.address : "localhost"; var bindAddress = config.address ? config.address : "localhost";