mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
add claus peters tips
This commit is contained in:
parent
d0e308e3ff
commit
f35cc43ac4
@ -16,7 +16,7 @@ ENV BUILD_COMMIT="0000000"
|
|||||||
## SET NODE_ENV
|
## SET NODE_ENV
|
||||||
ENV NODE_ENV="production"
|
ENV NODE_ENV="production"
|
||||||
## App relevant Envs
|
## App relevant Envs
|
||||||
ENV PORT="5037"
|
ENV PORT="6000"
|
||||||
|
|
||||||
# Labels
|
# Labels
|
||||||
LABEL org.label-schema.build-date="${BUILD_DATE}"
|
LABEL org.label-schema.build-date="${BUILD_DATE}"
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"appenders":
|
"appenders":
|
||||||
{
|
{
|
||||||
"dht":
|
"dlt":
|
||||||
{
|
{
|
||||||
"type": "dateFile",
|
"type": "dateFile",
|
||||||
"filename": "../logs/dht-node/apiversion-%v.log",
|
"filename": "../logs/dlt-connector/apiversion-%v.log",
|
||||||
"pattern": "yyyy-MM-dd",
|
"pattern": "yyyy-MM-dd",
|
||||||
"layout":
|
"layout":
|
||||||
{
|
{
|
||||||
@ -17,7 +17,7 @@
|
|||||||
"errorFile":
|
"errorFile":
|
||||||
{
|
{
|
||||||
"type": "dateFile",
|
"type": "dateFile",
|
||||||
"filename": "../logs/dht-node/errors.log",
|
"filename": "../logs/dlt-connector/errors.log",
|
||||||
"pattern": "yyyy-MM-dd",
|
"pattern": "yyyy-MM-dd",
|
||||||
"layout":
|
"layout":
|
||||||
{
|
{
|
||||||
@ -54,11 +54,11 @@
|
|||||||
"level": "debug",
|
"level": "debug",
|
||||||
"enableCallStack": true
|
"enableCallStack": true
|
||||||
},
|
},
|
||||||
"dht":
|
"dlt":
|
||||||
{
|
{
|
||||||
"appenders":
|
"appenders":
|
||||||
[
|
[
|
||||||
"dht",
|
"dlt",
|
||||||
"out",
|
"out",
|
||||||
"errors"
|
"errors"
|
||||||
],
|
],
|
||||||
|
|||||||
@ -2,12 +2,14 @@
|
|||||||
import { IotaClientSingleton } from '@/client/IotaClientSingleton'
|
import { IotaClientSingleton } from '@/client/IotaClientSingleton'
|
||||||
import CONFIG from '@/config'
|
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('apis/IotaClientSingleton/enabled', () => {
|
||||||
describe('Hello World', () => {
|
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()
|
const now = new Date()
|
||||||
let messageId: string
|
let messageId: string
|
||||||
const messageString = 'Hello World - ' + now.toString()
|
const messageString = 'Hello World - ' + now.toString()
|
||||||
|
|||||||
@ -35,12 +35,7 @@ class IotaClientSingleton {
|
|||||||
}
|
}
|
||||||
if (!IotaClientSingleton.instance) {
|
if (!IotaClientSingleton.instance) {
|
||||||
IotaClientSingleton.instance = new IotaClientSingleton()
|
IotaClientSingleton.instance = new IotaClientSingleton()
|
||||||
try {
|
IotaClientSingleton.instance.client = new ClientBuilder().node(CONFIG.IOTA_API_URL).build()
|
||||||
IotaClientSingleton.instance.client = new ClientBuilder().node(CONFIG.IOTA_API_URL).build()
|
|
||||||
} catch (e) {
|
|
||||||
logger.error("couldn't connect to iota")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return IotaClientSingleton.instance
|
return IotaClientSingleton.instance
|
||||||
|
|||||||
@ -18,9 +18,8 @@ describe('apis/IotaClientSingleton/invalidIotaUrl', () => {
|
|||||||
CONFIG.IOTA = true
|
CONFIG.IOTA = true
|
||||||
CONFIG.IOTA_API_URL = 'invalidUrl'
|
CONFIG.IOTA_API_URL = 'invalidUrl'
|
||||||
})
|
})
|
||||||
it('log "couldn\'t connect to iota"', () => {
|
it('throw exception on invalid iota url', () => {
|
||||||
const spyLog = jest.spyOn(logger, 'error')
|
// eslint-disable-next-line jest/unbound-method
|
||||||
expect(IotaClientSingleton.getInstance()).toBeUndefined()
|
expect(IotaClientSingleton.getInstance).toThrow()
|
||||||
expect(spyLog).toHaveBeenCalledWith("couldn't connect to iota")
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -6,6 +6,6 @@ const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8'))
|
|||||||
|
|
||||||
log4js.configure(options)
|
log4js.configure(options)
|
||||||
|
|
||||||
const logger = log4js.getLogger('dlt-connector')
|
const logger = log4js.getLogger('dlt')
|
||||||
|
|
||||||
export { logger }
|
export { logger }
|
||||||
|
|||||||
@ -163,12 +163,12 @@ services:
|
|||||||
- internal-net
|
- internal-net
|
||||||
- external-net
|
- external-net
|
||||||
ports:
|
ports:
|
||||||
- 5037:5037
|
- 6000:6000
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
# Envs used in Dockerfile
|
# Envs used in Dockerfile
|
||||||
# - DOCKER_WORKDIR="/app"
|
# - DOCKER_WORKDIR="/app"
|
||||||
- PORT=5037
|
- PORT=6000
|
||||||
- BUILD_DATE
|
- BUILD_DATE
|
||||||
- BUILD_VERSION
|
- BUILD_VERSION
|
||||||
- BUILD_COMMIT
|
- BUILD_COMMIT
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user