Merge pull request #2563 from thelounge/xpaw/no-global-log

Remove `log` from `global`

.eslintrc.yml

@@ -86,7 +86,4 @@ rules:
   template-curly-spacing: error
   yoda: error
 
-globals:
-  log: false
-
 extends: eslint:recommended

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

src/plugins/auth/ldap.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const log = require("../../log");
 const Helper = require("../../helper");
 
 // Forked ldapjs for 2 reasons:

src/plugins/auth/local.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const log = require("../../log");
 const Helper = require("../../helper");
 const colors = require("chalk");
 

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");

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");

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");

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");

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");

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");

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");

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);

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");

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");

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");

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");

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;