From f35cc43ac4d2760af65347e27eb7c31a67f37bbd Mon Sep 17 00:00:00 2001
From: Einhornimmond <git@einhornimmond.de>
Date: Wed, 5 Jul 2023 13:12:32 +0200
Subject: [PATCH] add claus peters tips

---
 dlt-connector/Dockerfile                               |  2 +-
 dlt-connector/log4js-config.json                       | 10 +++++-----
 dlt-connector/src/client/IotaClientSingleton.test.ts   | 10 ++++++----
 dlt-connector/src/client/IotaClientSingleton.ts        |  7 +------
 .../src/client/IotaClientSingleton_disabled.test.ts    |  7 +++----
 dlt-connector/src/server/logger.ts                     |  2 +-
 docker-compose.yml                                     |  4 ++--
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/dlt-connector/Dockerfile b/dlt-connector/Dockerfile
index a02330202..800af9177 100644
--- a/dlt-connector/Dockerfile
+++ b/dlt-connector/Dockerfile
@@ -16,7 +16,7 @@ ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
 ENV NODE_ENV="production"
 ## App relevant Envs
-ENV PORT="5037"
+ENV PORT="6000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
diff --git a/dlt-connector/log4js-config.json b/dlt-connector/log4js-config.json
index 3e5cc59ec..d67db87c8 100644
--- a/dlt-connector/log4js-config.json
+++ b/dlt-connector/log4js-config.json
@@ -1,10 +1,10 @@
 {
   "appenders": 
   {
-    "dht": 
+    "dlt": 
     {
       "type": "dateFile",
-      "filename": "../logs/dht-node/apiversion-%v.log",
+      "filename": "../logs/dlt-connector/apiversion-%v.log",
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
@@ -17,7 +17,7 @@
     "errorFile": 
     {
       "type": "dateFile",
-      "filename": "../logs/dht-node/errors.log",
+      "filename": "../logs/dlt-connector/errors.log",
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
@@ -54,11 +54,11 @@
       "level": "debug",
       "enableCallStack": true
     },
-    "dht":
+    "dlt":
     {
       "appenders":
       [
-        "dht",
+        "dlt",
         "out",
         "errors"
       ],
diff --git a/dlt-connector/src/client/IotaClientSingleton.test.ts b/dlt-connector/src/client/IotaClientSingleton.test.ts
index 18c8007d6..d416cea69 100644
--- a/dlt-connector/src/client/IotaClientSingleton.test.ts
+++ b/dlt-connector/src/client/IotaClientSingleton.test.ts
@@ -2,12 +2,14 @@
 import { IotaClientSingleton } from '@/client/IotaClientSingleton'
 import CONFIG from '@/config'
 
-CONFIG.IOTA = true
-CONFIG.IOTA_COMMUNITY_ALIAS = 'GRADIDO: TestHelloWelt2'
-CONFIG.IOTA_API_URL = 'https://chrysalis-nodes.iota.org'
-
 describe('apis/IotaClientSingleton/enabled', () => {
   describe('Hello World', () => {
+    beforeEach(() => {
+      CONFIG.IOTA = true
+      CONFIG.IOTA_COMMUNITY_ALIAS = 'GRADIDO: TestHelloWelt2'
+      CONFIG.IOTA_API_URL = 'https://chrysalis-nodes.iota.org'
+    })
+
     const now = new Date()
     let messageId: string
     const messageString = 'Hello World - ' + now.toString()
diff --git a/dlt-connector/src/client/IotaClientSingleton.ts b/dlt-connector/src/client/IotaClientSingleton.ts
index 22378fca0..c65616fa1 100644
--- a/dlt-connector/src/client/IotaClientSingleton.ts
+++ b/dlt-connector/src/client/IotaClientSingleton.ts
@@ -35,12 +35,7 @@ class IotaClientSingleton {
     }
     if (!IotaClientSingleton.instance) {
       IotaClientSingleton.instance = new IotaClientSingleton()
-      try {
-        IotaClientSingleton.instance.client = new ClientBuilder().node(CONFIG.IOTA_API_URL).build()
-      } catch (e) {
-        logger.error("couldn't connect to iota")
-        return
-      }
+      IotaClientSingleton.instance.client = new ClientBuilder().node(CONFIG.IOTA_API_URL).build()
     }
 
     return IotaClientSingleton.instance
diff --git a/dlt-connector/src/client/IotaClientSingleton_disabled.test.ts b/dlt-connector/src/client/IotaClientSingleton_disabled.test.ts
index be368e498..c6b3704af 100644
--- a/dlt-connector/src/client/IotaClientSingleton_disabled.test.ts
+++ b/dlt-connector/src/client/IotaClientSingleton_disabled.test.ts
@@ -18,9 +18,8 @@ describe('apis/IotaClientSingleton/invalidIotaUrl', () => {
     CONFIG.IOTA = true
     CONFIG.IOTA_API_URL = 'invalidUrl'
   })
-  it('log "couldn\'t connect to iota"', () => {
-    const spyLog = jest.spyOn(logger, 'error')
-    expect(IotaClientSingleton.getInstance()).toBeUndefined()
-    expect(spyLog).toHaveBeenCalledWith("couldn't connect to iota")
+  it('throw exception on invalid iota url', () => {
+    // eslint-disable-next-line jest/unbound-method
+    expect(IotaClientSingleton.getInstance).toThrow()
   })
 })
diff --git a/dlt-connector/src/server/logger.ts b/dlt-connector/src/server/logger.ts
index c7da1eaa1..5b7807147 100644
--- a/dlt-connector/src/server/logger.ts
+++ b/dlt-connector/src/server/logger.ts
@@ -6,6 +6,6 @@ const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8'))
 
 log4js.configure(options)
 
-const logger = log4js.getLogger('dlt-connector')
+const logger = log4js.getLogger('dlt')
 
 export { logger }
diff --git a/docker-compose.yml b/docker-compose.yml
index fe0a69905..f3e0a7cea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -163,12 +163,12 @@ services:
       - internal-net
       - external-net
     ports:
-      - 5037:5037
+      - 6000:6000
     restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
-      - PORT=5037
+      - PORT=6000
       - BUILD_DATE
       - BUILD_VERSION
       - BUILD_COMMIT