fixup! TB 40933: Add tor-launcher functionality (e3a0e855) · Commits · The Tor Project / Applications / Tor Browser

toolkit/components/tor-launcher/TorProvider.sys.mjs

+12 −11

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ const logger = console.createInstance({
		*/
		/**
		* @typedef {object} LogEntry An object with a log message
		* @property {Date} date The date at which we received the message
		* @property {string} timestamp The local date-time stamp at which we received the message
		* @property {string} type The message level
		* @property {string} msg The message
		*/
		@@ -518,13 +518,7 @@ export class TorProvider {
		*/
		getLog() {
		return this.#logs
		.map(logObj => {
		const timeStr = logObj.date
		.toISOString()
		.replace("T", " ")
		.replace("Z", "");
		return `${timeStr} [${logObj.type}] ${logObj.msg}`;
		})
		.map(logObj => `${logObj.timestamp} [${logObj.type}] ${logObj.msg}`)
		.join(TorLauncherUtil.isWindows ? "\r\n" : "\n");
		}

		@@ -1031,9 +1025,16 @@ export class TorProvider {
		Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr);
		}

		Services.obs.notifyObservers({ type, msg }, TorProviderTopics.TorLog);
		const timestamp = new Date()
		.toISOString()
		.replace("T", " ")
		.replace("Z", "");

		Services.obs.notifyObservers(
		{ type, msg, timestamp },
		TorProviderTopics.TorLog
		);

		const date = new Date();
		const maxEntries = Services.prefs.getIntPref(
		Preferences.MaxLogEntries,
		1000
		@@ -1042,7 +1043,7 @@ export class TorProvider {
		this.#logs.splice(0, 1);
		}

		this.#logs.push({ date, type, msg });
		this.#logs.push({ type, msg, timestamp });
		switch (type) {
		case "ERR":
		logger.error(`[Tor error] ${msg}`);