Skip to content

Commit

Permalink
refactor(logger): change logger and logger decorator names
Browse files Browse the repository at this point in the history
  • Loading branch information
lennykean committed Feb 15, 2021
1 parent f3ebd0f commit 3986d40
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
@@ -1,17 +1,16 @@
import { Reflect } from "../../di/shims/reflect.ts";
import {
LOGGER_NAMESPACE,
LOGGING_FILTER,
LOGGING_FORMATTER,
LOGGING_PROVIDER,
} from "../constants.ts";
import { DiContainer, Type } from "../deps.ts";
import { Log } from "../log.ts";
import { Logger } from "../logger.ts";

/**
* Decorator used to inject a logger
*/
export function Logger(
export function InjectLogger(
name?: string,
): PropertyDecorator & ParameterDecorator {
return function (
Expand All @@ -20,7 +19,7 @@ export function Logger(
propName?: string | symbol,
paramIndex?: number,
) {
const logger = class extends Log {};
const logger = class extends Logger {};
let loggerName = name;

if (propName) {
Expand Down
2 changes: 1 addition & 1 deletion core/log.ts → core/logger.ts
Expand Up @@ -12,7 +12,7 @@ import { LoggingFormatter } from "./logging-formatter.ts";
import { LoggingProvider } from "./logging-provider.ts";

@Injectable()
export class Log {
export class Logger {
@Optional()
@Inject(LOGGER_NAMESPACE)
namespace?: string;
Expand Down
4 changes: 2 additions & 2 deletions core/mod.ts
Expand Up @@ -13,7 +13,7 @@ export * from "./decorators/filter.ts";
export * from "./decorators/get.ts";
export * from "./decorators/head.ts";
export * from "./decorators/header.ts";
export * from "./decorators/logger.ts";
export * from "./decorators/inject-logger.ts";
export * from "./decorators/mv-module.ts";
export * from "./decorators/param.ts";
export * from "./decorators/patch.ts";
Expand All @@ -26,7 +26,7 @@ export * from "./decorators/transform.ts";
export * from "./default-logging-formatter.ts";
export * from "./lifecycle-events.ts";
export * from "./log-level.ts";
export * from "./log.ts";
export * from "./logger.ts";
export * from "./logging-filter.ts";
export * from "./logging-formatter.ts";
export * from "./logging-provider.ts";
Expand Down
6 changes: 3 additions & 3 deletions core/platform.ts
Expand Up @@ -12,7 +12,7 @@ import {
} from "./controller-metadata.ts";
import { DiContainer, Scope, Type, TypeIdentifier } from "./deps.ts";
import { OnPlatformBootstrap } from "./lifecycle-events.ts";
import { Log } from "./log.ts";
import { Logger } from "./logger.ts";
import { LoggingFilter } from "./logging-filter.ts";
import { LoggingFormatter } from "./logging-formatter.ts";
import { LoggingProvider } from "./logging-provider.ts";
Expand Down Expand Up @@ -49,7 +49,7 @@ export abstract class Platform {
readonly #container: DiContainer;
#module?: ModuleRef;

protected logger!: Log;
protected logger!: Logger;

constructor(container: DiContainer) {
this.#container = container;
Expand Down Expand Up @@ -117,7 +117,7 @@ export abstract class Platform {
this.#container.createChild(moduleType.name),
this.#diCache,
);
this.logger = await this.resolve(Log);
this.logger = await this.resolve(Logger);
this.logger.namespace = "Momentum";
this.logger.loggerName = "Internal";
this.logger.info(`Initializing platform`);
Expand Down
6 changes: 3 additions & 3 deletions core/server-controller.ts
Expand Up @@ -10,7 +10,7 @@ import { DependencyResolver, Scope, Type } from "./deps.ts";
import { FilterCatalog } from "./filter-catalog.ts";
import {
ContentResult,
Log,
Logger,
MvTransformer,
OnRequestEnd,
OnRequestStart,
Expand All @@ -35,13 +35,13 @@ export class ServerController {
#middlewareCache?: MvMiddleware[];
#globalErrorHandlers: { errorHandler: ErrorHandler; priority?: number }[] =
[];
#logger!: Log;
#logger!: Logger;

constructor(platform: ServerPlatform) {
this.#platform = platform;
}

async initialize(logger: Log) {
async initialize(logger: Logger) {
this.#logger = logger;
this.#platform.addMiddlewareHandler(async (context) => {
const contextAccessor = new ContextAccessor(context, this.#platform);
Expand Down
16 changes: 9 additions & 7 deletions platform-oak/platform-oak.ts
Expand Up @@ -75,6 +75,14 @@ export class OakPlatform extends ServerPlatform {

async postBootstrap() {
this.#app.use(this.#router.routes());
this.#app.addEventListener("listen", ({ hostname, port, secure }) => {
this.logger.log([
`PlatformOak listening on `,
secure ? "https://" : "http://",
hostname ?? "localhost",
`:${port}`,
].join(""));
});
await super.postBootstrap();
}

Expand Down Expand Up @@ -206,13 +214,7 @@ export class OakPlatform extends ServerPlatform {
* Start listening for requests
*/
async listen(options: ListenOptions) {
const listenPromise = this.#app.listen(options);
this.logger.info(
`PlatformOak listening on ${
options.hostname ? options.hostname + ":" : "port "
}${options.port}`,
);
await listenPromise;
await this.#app.listen(options);
}

private parseFormBody(form: URLSearchParams, identifier: string) {
Expand Down

0 comments on commit 3986d40

Please sign in to comment.