diff --git a/core/src/node/index.ts b/core/src/node/index.ts index 49c2c3c26e..50651d1fda 100644 --- a/core/src/node/index.ts +++ b/core/src/node/index.ts @@ -5,3 +5,4 @@ export * from './extension/store' export * from './download' export * from './module' export * from './api' +export * from './log' diff --git a/core/src/node/log.ts b/core/src/node/log.ts new file mode 100644 index 0000000000..6979e2afdc --- /dev/null +++ b/core/src/node/log.ts @@ -0,0 +1,14 @@ +import fs from 'fs' +import util from 'util' +import path from 'path' +import os from 'os' + +export const logPath = path.join(os.homedir(), 'jan', 'app.log') + +var log_file = fs.createWriteStream(logPath, { + flags: 'a', +}) + +export const log = function (d: any) { + log_file.write(util.format(d) + '\n') +} diff --git a/server/index.ts b/server/index.ts index 6a03c06fd2..55b4a8d3ce 100644 --- a/server/index.ts +++ b/server/index.ts @@ -1,9 +1,8 @@ import fastify from "fastify"; import dotenv from "dotenv"; -import { v1Router } from "@janhq/core/node"; +import { log, v1Router } from "@janhq/core/node"; import path from "path"; -import fs from "fs"; -import util from "util"; + import os from "os"; dotenv.config(); @@ -14,18 +13,6 @@ const serverLogPath = path.join(os.homedir(), "jan", "server.log"); let server: any | undefined = undefined; -var log_file = fs.createWriteStream(serverLogPath, { - flags: "a", -}); -var log_stdout = process.stdout; -var log_stderr = process.stderr; - -const logServer = function (d: any) { - log_file.write(util.format(d) + "\n"); - log_stdout.write(util.format(d) + "\n"); - log_stderr.write(util.format(d) + "\n"); -}; - export const startServer = async (schemaPath?: string, baseDir?: string) => { try { server = fastify({ @@ -75,12 +62,10 @@ export const startServer = async (schemaPath?: string, baseDir?: string) => { host: JAN_API_HOST, }) .then(() => { - logServer( - `JAN API listening at: http://${JAN_API_HOST}:${JAN_API_PORT}` - ); + log(`JAN API listening at: http://${JAN_API_HOST}:${JAN_API_PORT}`); }); } catch (e) { - logServer(e); + log(e); } }; @@ -88,6 +73,6 @@ export const stopServer = async () => { try { await server.close(); } catch (e) { - logServer(e); + log(e); } };