diff --git a/.eslintrc.yml b/.eslintrc.yml index 41c77f21..ed5943d3 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -86,7 +86,4 @@ rules: template-curly-spacing: error yoda: error -globals: - log: false - extends: eslint:recommended diff --git a/src/client.js b/src/client.js index e1b5c456..863da7a0 100644 --- a/src/client.js +++ b/src/client.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("./log"); const colors = require("chalk"); const Chan = require("./models/chan"); const crypto = require("crypto"); diff --git a/src/clientManager.js b/src/clientManager.js index 6d158cfc..6077e315 100644 --- a/src/clientManager.js +++ b/src/clientManager.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("./log"); const colors = require("chalk"); const fs = require("fs"); const path = require("path"); diff --git a/src/command-line/index.js b/src/command-line/index.js index e711e9ec..3665b00c 100644 --- a/src/command-line/index.js +++ b/src/command-line/index.js @@ -1,8 +1,7 @@ "use strict"; -global.log = require("../log.js"); - const _ = require("lodash"); +const log = require("../log"); const fs = require("fs"); const path = require("path"); const program = require("commander"); diff --git a/src/command-line/install.js b/src/command-line/install.js index e21cef75..73487962 100644 --- a/src/command-line/install.js +++ b/src/command-line/install.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../log"); const colors = require("chalk"); const program = require("commander"); const Helper = require("../helper"); diff --git a/src/command-line/start.js b/src/command-line/start.js index b8db9919..52a57968 100644 --- a/src/command-line/start.js +++ b/src/command-line/start.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../log"); const colors = require("chalk"); const fs = require("fs"); const fsextra = require("fs-extra"); diff --git a/src/command-line/uninstall.js b/src/command-line/uninstall.js index 1de50041..1b4f8249 100644 --- a/src/command-line/uninstall.js +++ b/src/command-line/uninstall.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../log"); const colors = require("chalk"); const path = require("path"); const program = require("commander"); diff --git a/src/command-line/upgrade.js b/src/command-line/upgrade.js index 4b540a1d..50b2ec22 100644 --- a/src/command-line/upgrade.js +++ b/src/command-line/upgrade.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../log"); const colors = require("chalk"); const program = require("commander"); const Helper = require("../helper"); diff --git a/src/command-line/users/add.js b/src/command-line/users/add.js index 939e1051..cf9600be 100644 --- a/src/command-line/users/add.js +++ b/src/command-line/users/add.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const colors = require("chalk"); const program = require("commander"); const fs = require("fs"); diff --git a/src/command-line/users/edit.js b/src/command-line/users/edit.js index 38db830e..451b4b77 100644 --- a/src/command-line/users/edit.js +++ b/src/command-line/users/edit.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const program = require("commander"); const child = require("child_process"); const colors = require("chalk"); diff --git a/src/command-line/users/list.js b/src/command-line/users/list.js index d55f835e..f10914af 100644 --- a/src/command-line/users/list.js +++ b/src/command-line/users/list.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const colors = require("chalk"); const program = require("commander"); const fs = require("fs"); diff --git a/src/command-line/users/remove.js b/src/command-line/users/remove.js index 3c0a353d..b96b62a8 100644 --- a/src/command-line/users/remove.js +++ b/src/command-line/users/remove.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const colors = require("chalk"); const program = require("commander"); const fs = require("fs"); diff --git a/src/command-line/users/reset.js b/src/command-line/users/reset.js index bed49233..58241935 100644 --- a/src/command-line/users/reset.js +++ b/src/command-line/users/reset.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const colors = require("chalk"); const program = require("commander"); const fs = require("fs"); diff --git a/src/command-line/utils.js b/src/command-line/utils.js index 74d75148..e406f637 100644 --- a/src/command-line/utils.js +++ b/src/command-line/utils.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("../log"); const colors = require("chalk"); const fs = require("fs"); const Helper = require("../helper"); diff --git a/src/helper.js b/src/helper.js index 388763ea..919b9ead 100644 --- a/src/helper.js +++ b/src/helper.js @@ -2,6 +2,7 @@ const pkg = require("../package.json"); const _ = require("lodash"); +const log = require("./log"); const path = require("path"); const os = require("os"); const fs = require("fs"); diff --git a/src/identification.js b/src/identification.js index 81bcb0ea..099b3ee6 100644 --- a/src/identification.js +++ b/src/identification.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("./log"); const fs = require("fs"); const net = require("net"); const colors = require("chalk"); diff --git a/src/models/chan.js b/src/models/chan.js index 57b51c66..fd08e5d5 100644 --- a/src/models/chan.js +++ b/src/models/chan.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("../log"); const Helper = require("../helper"); const User = require("./user"); const Msg = require("./msg"); diff --git a/src/models/network.js b/src/models/network.js index 0698c113..75e1cc56 100644 --- a/src/models/network.js +++ b/src/models/network.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("../log"); const uuidv4 = require("uuid/v4"); const IrcFramework = require("irc-framework"); const Chan = require("./chan"); diff --git a/src/plugins/auth/ldap.js b/src/plugins/auth/ldap.js index 2d4ef70c..754f2b72 100644 --- a/src/plugins/auth/ldap.js +++ b/src/plugins/auth/ldap.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const Helper = require("../../helper"); // Forked ldapjs for 2 reasons: diff --git a/src/plugins/auth/local.js b/src/plugins/auth/local.js index 09381dd0..0be707ec 100644 --- a/src/plugins/auth/local.js +++ b/src/plugins/auth/local.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const Helper = require("../../helper"); const colors = require("chalk"); diff --git a/src/plugins/irc-events/connection.js b/src/plugins/irc-events/connection.js index 94bddad7..40bc86c7 100644 --- a/src/plugins/irc-events/connection.js +++ b/src/plugins/irc-events/connection.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("../../log"); const Msg = require("../../models/msg"); const Chan = require("../../models/chan"); const Helper = require("../../helper"); diff --git a/src/plugins/messageStorage/sqlite.js b/src/plugins/messageStorage/sqlite.js index 0db36b54..2090a259 100644 --- a/src/plugins/messageStorage/sqlite.js +++ b/src/plugins/messageStorage/sqlite.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const path = require("path"); const fsextra = require("fs-extra"); const Helper = require("../../helper"); diff --git a/src/plugins/messageStorage/text.js b/src/plugins/messageStorage/text.js index 70b11949..ce1e63a4 100644 --- a/src/plugins/messageStorage/text.js +++ b/src/plugins/messageStorage/text.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const fs = require("fs"); const fsextra = require("fs-extra"); const path = require("path"); diff --git a/src/plugins/packages/index.js b/src/plugins/packages/index.js index 878908eb..afab956c 100644 --- a/src/plugins/packages/index.js +++ b/src/plugins/packages/index.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../log"); const colors = require("chalk"); const path = require("path"); const Helper = require("../../helper"); diff --git a/src/plugins/storage.js b/src/plugins/storage.js index 4d2a8f90..3faada58 100644 --- a/src/plugins/storage.js +++ b/src/plugins/storage.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../log"); const fs = require("fs"); const fsextra = require("fs-extra"); const path = require("path"); diff --git a/src/plugins/webpush.js b/src/plugins/webpush.js index 9a3fadeb..c840e6e4 100644 --- a/src/plugins/webpush.js +++ b/src/plugins/webpush.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("../log"); const fs = require("fs"); const path = require("path"); const WebPushAPI = require("web-push"); diff --git a/src/server.js b/src/server.js index 201c597a..1bfb60ba 100644 --- a/src/server.js +++ b/src/server.js @@ -1,6 +1,7 @@ "use strict"; const _ = require("lodash"); +const log = require("./log"); const pkg = require("../package.json"); const Client = require("./client"); const ClientManager = require("./clientManager"); diff --git a/test/fixtures/env.js b/test/fixtures/env.js index d0af6cf2..67f22edb 100644 --- a/test/fixtures/env.js +++ b/test/fixtures/env.js @@ -1,6 +1,4 @@ "use strict"; -global.log = require("../../src/log.js"); - const home = require("path").join(__dirname, ".thelounge"); require("../../src/helper").setHome(home); diff --git a/test/plugins/auth/ldap.js b/test/plugins/auth/ldap.js index cf58b2d2..a4fa093e 100644 --- a/test/plugins/auth/ldap.js +++ b/test/plugins/auth/ldap.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../../src/log"); const ldapAuth = require("../../../src/plugins/auth/ldap"); const Helper = require("../../../src/helper"); const ldap = require("thelounge-ldapjs-non-maintained-fork"); diff --git a/test/plugins/packages/indexTest.js b/test/plugins/packages/indexTest.js index 0777534f..5239a617 100644 --- a/test/plugins/packages/indexTest.js +++ b/test/plugins/packages/indexTest.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../../src/log"); const expect = require("chai").expect; const stub = require("sinon").stub; const TestUtil = require("../../util"); diff --git a/test/server.js b/test/server.js index cf4f3895..ebe32fb8 100644 --- a/test/server.js +++ b/test/server.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../src/log"); const Helper = require("../src/helper"); const expect = require("chai").expect; const request = require("request"); diff --git a/test/src/command-line/utilsTest.js b/test/src/command-line/utilsTest.js index 6e1ec680..fedc530e 100644 --- a/test/src/command-line/utilsTest.js +++ b/test/src/command-line/utilsTest.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../../src/log"); const expect = require("chai").expect; const stub = require("sinon").stub; const TestUtil = require("../../util"); diff --git a/test/tests/mergeConfig.js b/test/tests/mergeConfig.js index 0cde7a0c..89762da7 100644 --- a/test/tests/mergeConfig.js +++ b/test/tests/mergeConfig.js @@ -1,5 +1,6 @@ "use strict"; +const log = require("../../src/log"); const expect = require("chai").expect; const mergeConfig = require("../../src/helper").mergeConfig;