Merge pull request #21 from Enigmatis/graphqllogger-implement-polaris…

…logger

feat: polarisgraphqllogger implements polarislogger

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",

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';

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 {

test/integration-tests-without-connection/tests/query.test.ts

@@ -9,7 +9,7 @@ beforeEach(async () => {
     polarisServer = await startTestServer();
 });
 
-afterEach(() => {
+afterEach(async () => {
     return stopTestServer(polarisServer);
 });
 

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);
 }

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();