From d4ddf3acf06cb2063d4c4128fcda05ba8f2c78ab Mon Sep 17 00:00:00 2001 From: uurgothat Date: Mon, 4 Oct 2021 22:01:08 +0300 Subject: Rainbow the logs --- bundle/src/Server.ts | 3 ++- bundle/src/start.ts | 20 +++++++++++++++++++- bundle/src/stats.ts | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) (limited to 'bundle/src') diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index 3a56ee2e..a5405fa7 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -6,6 +6,7 @@ import { FosscordServer as APIServer } from "@fosscord/api"; import { Server as GatewayServer } from "@fosscord/gateway"; import { CDNServer } from "@fosscord/cdn/"; import express from "express"; +import { red, green, bold } from "chalk"; import { Config, initDatabase } from "@fosscord/util"; const app = express(); @@ -58,7 +59,7 @@ async function main() { } as any); await Promise.all([api.start(), cdn.start(), gateway.start()]); - console.log(`[Server] listening on port ${port}`); + console.log(`[Server] ${green(`listening on port ${bold(port)}`)}`); } main().catch(console.error); diff --git a/bundle/src/start.ts b/bundle/src/start.ts index f68a65bf..cc2053b9 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,10 +1,28 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; +import { red, bold, yellow, cyan } from "chalk"; import { initStats } from "./stats"; // TODO: add tcp socket event transmission const cores = 1 || Number(process.env.threads) || os.cpus().length; +const commit = require('child_process').execSync('git rev-parse HEAD').toString().trim(); + +console.log(bold(` +███████ ██████ ███████ ███████ ██████ ██████ ██████ ██████ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +█████ ██ ██ ███████ ███████ ██ ██ ██ ██████ ██ ██ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +██ ██████ ███████ ███████ ██████ ██████ ██ ██ ██████ + + + fosscord-server | ${yellow(`Pre-relase (${commit.slice(0, 7)})`)} + +Current commit: ${cyan(commit)} (${yellow(commit.slice(0, 7))}) +`)) + + + if (cluster.isMaster && !process.env.masterStarted) { process.env.masterStarted = "true"; @@ -24,7 +42,7 @@ if (cluster.isMaster && !process.env.masterStarted) { cluster.on("exit", (worker: any, code: any, signal: any) => { console.log( - `[Worker] died with pid: ${worker.process.pid} , restarting ...` + `[Worker] ${red(`died with pid: ${worker.process.pid} , restarting ...`)}` ); cluster.fork(); }); diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts index e6941db2..5dc69efe 100644 --- a/bundle/src/stats.ts +++ b/bundle/src/stats.ts @@ -1,5 +1,6 @@ import os from "os"; import osu from "node-os-utils"; +import {} from "chalk"; export function initStats() { console.log(`[Path] running in ${__dirname}`); -- cgit 1.5.1