From df0df73335fe2920d072bdb679fac353e55a6385 Mon Sep 17 00:00:00 2001
From: Claus-Peter Huebner <claus-peter.huebner@email.de>
Date: Fri, 5 May 2023 15:17:31 +0200
Subject: [PATCH] rework PR-comments

---
 backend/src/federation/client/1_0/FederationClient.ts | 2 +-
 backend/src/federation/client/1_1/FederationClient.ts | 2 +-
 dht-node/src/config/tools.ts                          | 6 +++---
 dht-node/src/dht_node/index.ts                        | 2 +-
 dht-node/src/index.ts                                 | 9 ++++-----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index ea3d79a0e..52964e789 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -39,7 +39,7 @@ export async function requestGetPublicKey(
     logger.warn(`requestGetPublicKey processed without response data`)
   } catch (err) {
     if (err instanceof GraphQLError) {
-      logger.error(`RawRequest-Error on {} with message {}`, endpoint, err.message)
+      logger.error(`RawRequest-Error on ${endpoint} with message ${err.message}`)
     }
     throw new Error(`Request-Error in requestGetPublicKey.`)
   }
diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts
index db0c3fa07..c91ebb856 100644
--- a/backend/src/federation/client/1_1/FederationClient.ts
+++ b/backend/src/federation/client/1_1/FederationClient.ts
@@ -39,7 +39,7 @@ export async function requestGetPublicKey(
     logger.warn(`requestGetPublicKey processed without response data`)
   } catch (err) {
     if (err instanceof GraphQLError) {
-      logger.error(`RawRequest-Error on {} with message {}`, endpoint, err.message)
+      logger.error(`RawRequest-Error on ${endpoint} with message ${err.message}`)
     }
     throw new Error(`Request-Error in requestGetPublicKey`) // :${err}`)
   }
diff --git a/dht-node/src/config/tools.ts b/dht-node/src/config/tools.ts
index cc92f6fc2..bc8b05d68 100644
--- a/dht-node/src/config/tools.ts
+++ b/dht-node/src/config/tools.ts
@@ -1,8 +1,8 @@
 /** eslint-disable n/no-sync */
 import { logger } from '@/server/logger'
-import fs = require('fs')
-import os = require('os')
-import path = require('path')
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
 
 const envFilePath = path.resolve(__dirname, './../../.env.devop')
 
diff --git a/dht-node/src/dht_node/index.ts b/dht-node/src/dht_node/index.ts
index fbbd9982b..ca3cb6aab 100644
--- a/dht-node/src/dht_node/index.ts
+++ b/dht-node/src/dht_node/index.ts
@@ -15,7 +15,7 @@ const getSeed = (): Buffer | null => {
   logger.debug('dhtseed set by DEVOP.FEDERATION_DHT_SEED={}', DEVOP.FEDERATION_DHT_SEED)
   if (!dhtseed) {
     dhtseed = CONFIG.FEDERATION_DHT_SEED
-    logger.debug('dhtseed overwritten by CONFIG.FEDERATION_DHT_SEED={}', CONFIG.FEDERATION_DHT_SEED)
+    logger.debug(`dhtseed overwritten by CONFIG.FEDERATION_DHT_SEED=${CONFIG.FEDERATION_DHT_SEED}`)
   }
   return dhtseed ? Buffer.alloc(KEY_SECRET_SEEDBYTES, dhtseed) : null
 }
diff --git a/dht-node/src/index.ts b/dht-node/src/index.ts
index 3e2a7a7ca..4f481d041 100644
--- a/dht-node/src/index.ts
+++ b/dht-node/src/index.ts
@@ -24,19 +24,18 @@ async function main() {
   }
   // first read from .env.devop if exist
   let dhttopic = DEVOP.FEDERATION_DHT_TOPIC
-  logger.debug('dhttopic set by DEVOP.FEDERATION_DHT_TOPIC={}', DEVOP.FEDERATION_DHT_TOPIC)
+  logger.debug(`dhttopic set by DEVOP.FEDERATION_DHT_TOPIC=${DEVOP.FEDERATION_DHT_TOPIC}`)
   if (!dhttopic) {
     dhttopic = CONFIG.FEDERATION_DHT_TOPIC
     logger.debug(
-      'dhttopic overwritten by CONFIG.FEDERATION_DHT_TOPIC={}',
-      CONFIG.FEDERATION_DHT_TOPIC,
+      `dhttopic overwritten by CONFIG.FEDERATION_DHT_TOPIC=${CONFIG.FEDERATION_DHT_TOPIC}`,
     )
   }
   let dhtseed = DEVOP.FEDERATION_DHT_SEED
-  logger.debug('dhtseed set by DEVOP.FEDERATION_DHT_SEED={}', DEVOP.FEDERATION_DHT_SEED)
+  logger.debug(`dhtseed set by DEVOP.FEDERATION_DHT_SEED=${DEVOP.FEDERATION_DHT_SEED}`)
   if (!dhtseed) {
     dhtseed = CONFIG.FEDERATION_DHT_SEED
-    logger.debug('dhtseed overwritten by CONFIG.FEDERATION_DHT_SEED={}', CONFIG.FEDERATION_DHT_SEED)
+    logger.debug(`dhtseed overwritten by CONFIG.FEDERATION_DHT_SEED=${CONFIG.FEDERATION_DHT_SEED}`)
   }
   logger.info(`starting Federation on ${dhttopic} ${dhtseed ? 'with seed...' : 'without seed...'}`)
   await startDHT(dhttopic)