diff --git a/src/modules/app.ts b/src/modules/app.ts index b88814c..947dc6b 100644 --- a/src/modules/app.ts +++ b/src/modules/app.ts @@ -9,7 +9,7 @@ let app: FastifyInstance; export async function start() { const keyPair = getKeyPair(); app = fastify({ - logger: true, + logger: log.child({ module: "app-server" }), }); app.get("/", (req, res) => { @@ -17,8 +17,4 @@ export async function start() { }); await app.listen({ port: 80, host: "0.0.0.0" }); - - const address = app.server.address() as AddressInfo; - - log.info("HTTP/App Server started on ", `${address.address}:${address.port}`); } diff --git a/src/modules/relay.ts b/src/modules/relay.ts index 2e3ce75..0d0e564 100644 --- a/src/modules/relay.ts +++ b/src/modules/relay.ts @@ -17,7 +17,6 @@ import * as http2 from "http2"; import websocket from "@fastify/websocket"; export async function start() { - const relayPort = config.uint("port"); const dht = getSwarm(); let sslOptions: boolean | http2.SecureServerOptions = false; @@ -30,6 +29,7 @@ export async function start() { let relayServer = fastify({ http2: true, https: sslOptions as http2.SecureServerOptions, + logger: log.child({ module: "relay-server" }), }); relayServer.register(websocket); @@ -39,9 +39,4 @@ export async function start() { }); await relayServer.listen({ port: config.uint("port"), host: "0.0.0.0" }); - let address = relayServer.server.address() as AddressInfo; - log.info( - "DHT Relay Server started on ", - `${address.address}:${address.port}` - ); } diff --git a/src/modules/swarm.ts b/src/modules/swarm.ts index 3dc479e..1f44840 100644 --- a/src/modules/swarm.ts +++ b/src/modules/swarm.ts @@ -31,8 +31,8 @@ export async function start() { node.join(LUMEWEB_TOPIC_HASH); log.info( - "Relay Identity is", - b4a.from(node.dht.defaultKeyPair.publicKey).toString("hex") + "Relay Identity is %s", + b4a.from(getKeyPair().publicKey).toString("hex") ); return node;