diff options
Diffstat (limited to 'u/server')
| -rw-r--r-- | u/server/activity/health.ts | 2 | ||||
| -rw-r--r-- | u/server/filter/json.ts | 12 | ||||
| -rw-r--r-- | u/server/filter/mod.ts | 2 | ||||
| -rw-r--r-- | u/server/request.ts | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/u/server/activity/health.ts b/u/server/activity/health.ts index 3b4a23a..95dfa97 100644 --- a/u/server/activity/health.ts +++ b/u/server/activity/health.ts @@ -46,7 +46,7 @@ export class HealthCheckActivityImpl implements IHealthCheckActivity { return; } h.trace.trace(healthCheckMetric.failure); - h.trace.addTrace(LogLevel.ERROR).trace(`${value}`); + h.trace.addTrace(LogLevel.ERROR).trace(value); }), ), ) diff --git a/u/server/filter/json.ts b/u/server/filter/json.ts index 79eabac..06cf1bf 100644 --- a/u/server/filter/json.ts +++ b/u/server/filter/json.ts @@ -22,12 +22,13 @@ export const jsonModel = ): RequestFilter<MessageT> => (r: ITraceable<PenguenoRequest, ServerTrace>) => r - .bimap(TraceUtil.withMetricTrace(ParseJsonMetric)) + .bimap(TraceUtil.withFunctionTrace(jsonModel)) + .bimap(TraceUtil.withMetricTrace(ParseJsonMetric)) .map((j) => - Either.fromFailableAsync<Error, MessageT>(j.get().json()).then( + Either.fromFailableAsync<Error, MessageT>(() => j.get().json()).then( (either) => either.mapLeft((errReason) => { - j.trace.addTrace(LogLevel.WARN).trace(`${errReason}`); + j.trace.addTrace(LogLevel.WARN).trace(errReason); return new PenguenoError( "seems to be invalid JSON (>//<) can you fix?", 400, @@ -37,9 +38,8 @@ export const jsonModel = ) .peek( TraceUtil.promiseify((traceableEither) => - traceableEither.get().mapBoth( - () => traceableEither.trace.trace(ParseJsonMetric.failure), - () => traceableEither.trace.trace(ParseJsonMetric.success), + traceableEither.get().fold(({ isLeft }) => + traceableEither.trace.trace(ParseJsonMetric[isLeft ? "failure" : "success"]) ), ), ) diff --git a/u/server/filter/mod.ts b/u/server/filter/mod.ts index 3b247fc..0e0a4cb 100644 --- a/u/server/filter/mod.ts +++ b/u/server/filter/mod.ts @@ -14,7 +14,7 @@ export enum ErrorSource { export class PenguenoError extends Error { public readonly source: ErrorSource; constructor( - message: string, + override readonly message: string, public readonly status: number, ) { super(message); diff --git a/u/server/request.ts b/u/server/request.ts index 5dd9d7b..10357ca 100644 --- a/u/server/request.ts +++ b/u/server/request.ts @@ -43,7 +43,7 @@ export class PenguenoRequest extends Request { const logTraceable = LogTraceable.of( new PenguenoRequest(url, { ...request }, id, new Date()), ).bimap( - TraceUtil.withTrace(`Id=${id} Method=${request.method} Path=${pathname}`), + TraceUtil.withTrace(`RequestId = ${id}, Method = ${request.method}, Path = ${pathname}`), ); return LogMetricTraceable.ofLogTraceable(logTraceable); } |