Merge pull request supabase#136 from supabase/print-when-log-not-available

fix: print to stderr when logger is not available

Author: laktek

Cargo.lock

@@ -266,14 +266,20 @@ pub async fn create_worker(
             };
 
             let end_time = get_thread_time()?;
-            send_event_if_event_manager_available(
-                events_msg_tx_clone.clone(),
-                WorkerEvents::Log(LogEvent {
-                    msg: format!("CPU time used: {:?}ms", (end_time - start_time) / 1_000_000),
-                    level: LogLevel::Info,
-                }),
-                event_metadata_clone.clone(),
-            );
+            let cpu_time_msg =
+                format!("CPU time used: {:?}ms", (end_time - start_time) / 1_000_000);
+            if events_msg_tx_clone.is_some() {
+                send_event_if_event_manager_available(
+                    events_msg_tx_clone.clone(),
+                    WorkerEvents::Log(LogEvent {
+                        msg: cpu_time_msg,
+                        level: LogLevel::Info,
+                    }),
+                    event_metadata_clone.clone(),
+                );
+            } else {
+                error!("{}", cpu_time_msg);
+            }
 
             // remove the worker from pool
             if worker_key.is_some() {

crates/base/src/worker_ctx.rs

@@ -19,4 +19,5 @@ deno_http.workspace = true
 hyper.workspace = true
 serde.workspace = true
 bytes.workspace = true
+log.workspace = true
 sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }

crates/sb_workers/Cargo.toml

@@ -12,6 +12,7 @@ use deno_core::{
 use hyper::body::HttpBody;
 use hyper::header::{HeaderName, HeaderValue};
 use hyper::{Body, Request, Response};
+use log::error;
 use sb_worker_context::essentials::{
     CreateUserWorkerResult, UserWorkerMsgs, UserWorkerRuntimeOpts, WorkerContextInitOpts,
     WorkerRuntimeOpts,
@@ -158,7 +159,7 @@ pub fn op_user_worker_log(state: &mut OpState, msg: &str, is_err: bool) -> Resul
             metadata: event_metadata,
         })?;
     } else {
-        println!("[{:?}] {}", level, msg);
+        error!("[{:?}] {}", level, msg);
     }
     Ok(())
 }

crates/sb_workers/lib.rs

@@ -1,79 +1,79 @@
-import { serve } from 'https://deno.land/[email protected]/http/server.ts';
+import { serve } from "https://deno.land/[email protected]/http/server.ts";
 
-console.log('main function started');
+console.log("main function started");
 
 serve(async (req: Request) => {
-	const url = new URL(req.url);
-	const { pathname } = url;
+  const url = new URL(req.url);
+  const { pathname } = url;
 
-	// handle health checks
-	if (pathname === '/_internal/health') {
-		return new Response(
-			JSON.stringify({ 'message': 'ok' }),
-			{ status: 200, headers: { 'Content-Type': 'application/json' } },
-		);
-	}
+  // handle health checks
+  if (pathname === "/_internal/health") {
+    return new Response(
+      JSON.stringify({ "message": "ok" }),
+      { status: 200, headers: { "Content-Type": "application/json" } },
+    );
+  }
 
-	const path_parts = pathname.split('/');
-	const service_name = path_parts[1];
+  const path_parts = pathname.split("/");
+  const service_name = path_parts[1];
 
-	if (!service_name || service_name === '') {
-		const error = { msg: 'missing function name in request' };
-		return new Response(
-			JSON.stringify(error),
-			{ status: 400, headers: { 'Content-Type': 'application/json' } },
-		);
-	}
+  if (!service_name || service_name === "") {
+    const error = { msg: "missing function name in request" };
+    return new Response(
+      JSON.stringify(error),
+      { status: 400, headers: { "Content-Type": "application/json" } },
+    );
+  }
 
-	const servicePath = `./examples/${service_name}`;
-	console.error(`serving the request with ${servicePath}`);
+  const servicePath = `./examples/${service_name}`;
+  console.error(`serving the request with ${servicePath}`);
 
-	const createWorker = async () => {
-		const memoryLimitMb = 150;
-		const workerTimeoutMs = 10 * 1000;
-		const noModuleCache = false;
-		const customModuleRoot = null;
-		// you can provide an import map inline
-		// const inlineImportMap = {
-		//   imports: {
-		//     "std/": "https://deno.land/[email protected]/",
-		//     "cors": "./examples/_shared/cors.ts"
-		//   }
-		// }
-		// const importMapPath = `data:${encodeURIComponent(JSON.stringify(importMap))}?${encodeURIComponent('/home/deno/functions/test')}`;
-		const importMapPath = null;
-		const envVarsObj = Deno.env.toObject();
-		const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]]);
-		const forceCreate = false;
+  const createWorker = async () => {
+    const memoryLimitMb = 150;
+    const workerTimeoutMs = 5 * 60 * 1000;
+    const noModuleCache = false;
+    const customModuleRoot = null;
+    // you can provide an import map inline
+    // const inlineImportMap = {
+    //   imports: {
+    //     "std/": "https://deno.land/[email protected]/",
+    //     "cors": "./examples/_shared/cors.ts"
+    //   }
+    // }
+    // const importMapPath = `data:${encodeURIComponent(JSON.stringify(importMap))}?${encodeURIComponent('/home/deno/functions/test')}`;
+    const importMapPath = null;
+    const envVarsObj = Deno.env.toObject();
+    const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]]);
+    const forceCreate = false;
 
-		return await EdgeRuntime.userWorkers.create({
-			servicePath,
-			memoryLimitMb,
-			workerTimeoutMs,
-			noModuleCache,
-			importMapPath,
-			envVars,
-			forceCreate,
-			customModuleRoot,
-		});
-	};
+    return await EdgeRuntime.userWorkers.create({
+      servicePath,
+      memoryLimitMb,
+      workerTimeoutMs,
+      noModuleCache,
+      importMapPath,
+      envVars,
+      forceCreate,
+      customModuleRoot,
+    });
+  };
 
-	const callWorker = async () => {
-		try {
-			// If a worker for the given service path already exists,
-			// it will be reused by default.
-			// Update forceCreate option in createWorker to force create a new worker for each request.
-			const worker = await createWorker();
-			return await worker.fetch(req);
-		} catch (e) {
-			console.error(e);
-			const error = { msg: e.toString() };
-			return new Response(
-				JSON.stringify(error),
-				{ status: 500, headers: { 'Content-Type': 'application/json' } },
-			);
-		}
-	};
+  const callWorker = async () => {
+    try {
+      // If a worker for the given service path already exists,
+      // it will be reused by default.
+      // Update forceCreate option in createWorker to force create a new worker for each request.
+      const worker = await createWorker();
+      return await worker.fetch(req);
+    } catch (e) {
+      console.error(e);
+      const error = { msg: e.toString() };
+      return new Response(
+        JSON.stringify(error),
+        { status: 500, headers: { "Content-Type": "application/json" } },
+      );
+    }
+  };
 
-	return callWorker();
+  return callWorker();
 });