Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Route Rust logs into the web and mobile app logs

Manav Rathif3fbdc2c4b25
diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dart
index 2484eed124..fab1a383c3 100644
--- a/mobile/apps/locker/lib/main.dart
+++ b/mobile/apps/locker/lib/main.dart
@@ -120,11 +120,30 @@ Future<void> _ensureRustInitialized() async {
try {
await initFuture;
_isRustInitialized = true;
+ _attachRustLogStream();
} finally {
_rustInitFuture = null;
}
}
+void _attachRustLogStream() {
+ final logger = Logger("rust");
+ attachLogStream(maxLevel: LogLevel.info).listen((entry) {
+ final message = "[${entry.target}] ${entry.message}";
+ switch (entry.level) {
+ case LogLevel.error:
+ logger.severe(message);
+ case LogLevel.warn:
+ logger.warning(message);
+ case LogLevel.info:
+ logger.info(message);
+ case LogLevel.debug:
+ case LogLevel.trace:
+ logger.fine(message);
+ }
+ });
+}
+
ThemeMode _themeMode(AdaptiveThemeMode? savedThemeMode) {
if (savedThemeMode == null) return ThemeMode.system;
if (savedThemeMode.isLight) return ThemeMode.light;
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dart
index f625d3a592..6f28c0ac42 100644
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -558,11 +558,30 @@ Future<void> _ensureRustInitialized({required String via}) async {
try {
await initFuture;
_isRustInitialized = true;
+ _attachRustLogStream();
} finally {
_rustInitFuture = null;
}
}
+void _attachRustLogStream() {
+ final logger = Logger("rust");
+ attachLogStream(maxLevel: LogLevel.info).listen((entry) {
+ final message = "[${entry.target}] ${entry.message}";
+ switch (entry.level) {
+ case LogLevel.error:
+ logger.severe(message);
+ case LogLevel.warn:
+ logger.warning(message);
+ case LogLevel.info:
+ logger.info(message);
+ case LogLevel.debug:
+ case LogLevel.trace:
+ logger.fine(message);
+ }
+ });
+}
+
void logLocalSettings() {
final settings = {
'Show memories': memoriesCacheService.showAnyMemories,
diff --git a/mobile/packages/rust/lib/ente_rust.dart b/mobile/packages/rust/lib/ente_rust.dart
index ad1b513ec7..1d4a5aac01 100644
--- a/mobile/packages/rust/lib/ente_rust.dart
+++ b/mobile/packages/rust/lib/ente_rust.dart
@@ -1,4 +1,5 @@
library;
export 'src/rust/api/contacts.dart';
+export 'src/rust/api/logs.dart';
export 'src/rust/frb_generated.dart' show EnteRust;
diff --git a/web/packages/base/components/utils/hooks-app.ts b/web/packages/base/components/utils/hooks-app.ts
index 55497e0121..40228f90f3 100644
--- a/web/packages/base/components/utils/hooks-app.ts
+++ b/web/packages/base/components/utils/hooks-app.ts
@@ -1,6 +1,6 @@
import type { NotificationAttributes } from "ente-base/components/Notification";
import { setupI18n } from "ente-base/i18n";
-import { disableDiskLogs } from "ente-base/log";
+import { attachRustLogHook, disableDiskLogs } from "ente-base/log";
import { logUnhandledErrorsAndRejections } from "ente-base/log-web";
import { useRouter } from "next/router";
import { useCallback, useEffect, useState } from "react";
@@ -22,6 +22,7 @@ interface SetupLoggingOptions {
export const useSetupLogs = (opts?: SetupLoggingOptions) => {
useEffect(() => {
if (opts?.disableDiskLogs) disableDiskLogs();
+ attachRustLogHook();
logUnhandledErrorsAndRejections(true);
return () => logUnhandledErrorsAndRejections(false);
}, []);
diff --git a/web/packages/base/global-rust.d.ts b/web/packages/base/global-rust.d.ts
new file mode 100644
index 0000000000..7b0b1c1679
--- /dev/null
+++ b/web/packages/base/global-rust.d.ts
@@ -0,0 +1,7 @@
+declare global {
+ declare var enteRustLog:
+ | ((level: string, target: string, message: string) => void)
+ | undefined;
+}
+
+export {};
diff --git a/web/packages/base/log-web.ts b/web/packages/base/log-web.ts
index c8ee8552c3..87278ea1f2 100644
--- a/web/packages/base/log-web.ts
+++ b/web/packages/base/log-web.ts
@@ -1,5 +1,5 @@
import { buildEnvGitSHA, isDevBuild } from "ente-base/env";
-import log from "ente-base/log";
+import log, { attachRustLogHook } from "ente-base/log";
import { appName, appNames } from "./app";
export const logStartupBanner = (userID?: number) => {
@@ -46,6 +46,8 @@ export const logUnhandledErrorsAndRejections = (attach: boolean) => {
// Worker promise rejections are only observed when attached inside the worker.
export const logUnhandledErrorsAndRejectionsInWorker = () => {
+ attachRustLogHook();
+
const handleError = (event: ErrorEvent) => {
log.error("Unhandled error", event.error);
};
diff --git a/web/packages/base/log.ts b/web/packages/base/log.ts
index ded3fe283a..7ce56981da 100644
--- a/web/packages/base/log.ts
+++ b/web/packages/base/log.ts
@@ -91,3 +91,23 @@ export default {
info: logInfo,
debug: logDebug,
};
+
+export const attachRustLogHook = () => {
+ globalThis.enteRustLog = (level, target, message) => {
+ const m = `[rust] ${target}: ${message}`;
+ switch (level) {
+ case "ERROR":
+ logError(m);
+ break;
+ case "WARN":
+ logWarn(m);
+ break;
+ case "DEBUG":
+ case "TRACE":
+ logDebug(() => m);
+ break;
+ default:
+ logInfo(m);
+ }
+ };
+};