diff --git a/package-lock.json b/package-lock.json index aa28204..8ad5320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,24 +1156,27 @@ } }, "@enigmatis/polaris-graphql-logger": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@enigmatis/polaris-graphql-logger/-/polaris-graphql-logger-1.2.0.tgz", - "integrity": "sha512-0oJair4XNC1ZfZDbqVKqyx8B1EMVUfWkGYNP9n6g07iNlwUVwMeIef59rKzyl3YUrcS9S4L5g3MNGIXmhYHfgw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@enigmatis/polaris-graphql-logger/-/polaris-graphql-logger-1.3.0.tgz", + "integrity": "sha512-EWDv35zN0rTc5d50hkaH47xzPs002p9OBZKJ1NICxoA4IDrcY301qJLnX7UfqL5bFs8yvdIQMsNJXh8S4A6fLg==", "requires": { - "@enigmatis/polaris-common": "^1.0.9", - "@enigmatis/polaris-logs": "^2.6.2" + "@enigmatis/polaris-common": "^1.0.12", + "@enigmatis/polaris-logs": "^2.7.0", + "clean-deep": "^3.2.0" } }, "@enigmatis/polaris-logs": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@enigmatis/polaris-logs/-/polaris-logs-2.6.2.tgz", - "integrity": "sha512-74n0aUMX4ngk/6jVkTqeXm2gVvRg4qw3rXsY6lZ3us6fq3ptKy3LqweS6r9Voq8Nmqp3K7H5dhpULSEIZIVMtQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@enigmatis/polaris-logs/-/polaris-logs-2.7.0.tgz", + "integrity": "sha512-wJYQr1gUxLXFV8OrASkJG45/dXx4rcn7zCoz0f7gmAS+i06ZSjXS6IajuUOscO3qcipwwTgIMcwmU1VfDl6DIA==", "requires": { "@enigmatis/polaris-common": "^1.0.10", "@types/serialize-error": "^2.1.0", + "@types/uuid": "^3.4.7", "@types/winston": "^2.4.4", "clean-deep": "^3.2.0", "serialize-error": "^3.0.0", + "uuid": "^3.4.0", "winston": "^3.2.1", "winston-daily-rotate-file": "^3.10.0", "winston-logstash-transport": "^2.0.0", @@ -2118,8 +2121,7 @@ "@types/uuid": { "version": "3.4.7", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.7.tgz", - "integrity": "sha512-C2j2FWgQkF1ru12SjZJyMaTPxs/f6n90+5G5qNakBxKXjTBc/YTSelHh4Pz1HUDwxFXD9WvpQhOGCDC+/Y4mIQ==", - "dev": true + "integrity": "sha512-C2j2FWgQkF1ru12SjZJyMaTPxs/f6n90+5G5qNakBxKXjTBc/YTSelHh4Pz1HUDwxFXD9WvpQhOGCDC+/Y4mIQ==" }, "@types/winston": { "version": "2.4.4", @@ -4299,9 +4301,9 @@ } }, "env-variable": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz", - "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==" + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" }, "error-ex": { "version": "1.3.2", diff --git a/package.json b/package.json index 04fc729..e043279 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,8 @@ "homepage": "https://github.com/Enigmatis/polaris-core#readme", "dependencies": { "@enigmatis/polaris-common": "^1.0.12", - "@enigmatis/polaris-graphql-logger": "^1.2.0", - "@enigmatis/polaris-logs": "^2.6.2", + "@enigmatis/polaris-graphql-logger": "^1.3.0", + "@enigmatis/polaris-logs": "^2.7.0", "@enigmatis/polaris-middlewares": "^1.2.1", "@enigmatis/polaris-schema": "^1.0.6", "@enigmatis/polaris-typeorm": "^1.1.14", diff --git a/src/index.ts b/src/index.ts index 84bff88..b28a997 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,8 +4,9 @@ export { PolarisServerOptions } from './config/polaris-server-options'; export { MiddlewareConfiguration } from './config/middleware-configuration'; export { formatError } from './errors/error-formatter'; export { gql } from 'apollo-server-express'; -export * from '@enigmatis/polaris-logs'; export * from '@enigmatis/polaris-common'; +export { Reality } from '@enigmatis/polaris-common'; +export * from '@enigmatis/polaris-logs'; export * from '@enigmatis/polaris-graphql-logger'; export * from '@enigmatis/polaris-middlewares'; export * from '@enigmatis/polaris-schema'; diff --git a/src/server/polaris-server.ts b/src/server/polaris-server.ts index febae07..3bbe950 100644 --- a/src/server/polaris-server.ts +++ b/src/server/polaris-server.ts @@ -42,7 +42,7 @@ export class PolarisServer { constructor(config: PolarisServerOptions) { this.polarisServerConfig = PolarisServer.getActualConfiguration(config); - if (this.isPolarisGraphQLLogger(this.polarisServerConfig.logger)) { + if (this.polarisServerConfig.logger instanceof PolarisGraphQLLogger) { this.polarisGraphQLLogger = this.polarisServerConfig.logger; } else { this.polarisGraphQLLogger = new PolarisGraphQLLogger( @@ -84,16 +84,6 @@ export class PolarisServer { this.polarisGraphQLLogger.info('Server stopped'); } - private isPolarisGraphQLLogger( - logger: LoggerConfiguration | PolarisGraphQLLogger | undefined, - ): logger is PolarisGraphQLLogger { - if (logger as PolarisGraphQLLogger) { - return (logger as PolarisGraphQLLogger).polarisLogger !== undefined; - } else { - return false; - } - } - private getApolloServerConfigurations( serverContext: (context: any) => any, ): ApolloServerExpressConfig { diff --git a/test/integration-tests-without-connection/tests/query.test.ts b/test/integration-tests-without-connection/tests/query.test.ts index e6fe3c2..3baef33 100644 --- a/test/integration-tests-without-connection/tests/query.test.ts +++ b/test/integration-tests-without-connection/tests/query.test.ts @@ -9,7 +9,7 @@ beforeEach(async () => { polarisServer = await startTestServer(); }); -afterEach(() => { +afterEach(async () => { return stopTestServer(polarisServer); }); diff --git a/test/integration-tests/test-server/connection-manager.ts b/test/integration-tests/test-server/connection-manager.ts index de27c98..ad4e1b2 100644 --- a/test/integration-tests/test-server/connection-manager.ts +++ b/test/integration-tests/test-server/connection-manager.ts @@ -2,8 +2,5 @@ import { ConnectionOptions, createPolarisConnection } from '@enigmatis/polaris-t import { polarisGraphQLLogger } from './logger'; export async function initConnection(connectionOptions: ConnectionOptions) { - await createPolarisConnection( - connectionOptions, - polarisGraphQLLogger.getPolarisLogger() as any, - ); + await createPolarisConnection(connectionOptions, polarisGraphQLLogger); } diff --git a/test/integration-tests/test-server/main.ts b/test/integration-tests/test-server/main.ts index 75a9745..503912d 100644 --- a/test/integration-tests/test-server/main.ts +++ b/test/integration-tests/test-server/main.ts @@ -2,7 +2,7 @@ import { getConnectionManager } from '@enigmatis/polaris-typeorm'; import { PolarisServer } from '../../../src'; import { initConnection } from './connection-manager'; import { initializeDatabase } from './data-initalizer'; -import { loggerConfig } from './logger'; +import { polarisGraphQLLogger } from './logger'; import * as polarisProperties from './polaris-properties.json'; import { resolvers } from './schema/resolvers'; import { typeDefs } from './schema/type-defs'; @@ -16,7 +16,7 @@ const startApp = async () => { typeDefs, resolvers, port: polarisProperties.port, - logger: loggerConfig, + logger: polarisGraphQLLogger, connection: getConnectionManager().get(), }); await server.start();