chore(medusa): Prefer logger instead of console.log (#5846)
* chore(medusa): Prefer logger instead of console.log * Create nasty-comics-leave.md * fix imports
This commit is contained in:
1 parent
245e5c9a69
commit
b5748ab59e
14 files changed
+46
-20
No files matched your search
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"@medusajs/medusa": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
chore(medusa): Prefer logger instead of console.log
|
||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
import { FindParams } from "../../../../types/common"
|
import { FindParams } from "../../../../types/common"
|
||||||
import { OrdersReturnItem } from "../../../../types/orders"
|
import { OrdersReturnItem } from "../../../../types/orders"
|
||||||
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @oas [post] /admin/orders/{id}/return
|
* @oas [post] /admin/orders/{id}/return
|
||||||
@@ -105,6 +106,7 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
const idempotencyKeyService = req.scope.resolve("idempotencyKeyService")
|
const idempotencyKeyService = req.scope.resolve("idempotencyKeyService")
|
||||||
const manager: EntityManager = req.scope.resolve("manager")
|
const manager: EntityManager = req.scope.resolve("manager")
|
||||||
|
const logger: Logger = req.scope.resolve("logger")
|
||||||
|
|
||||||
const headerKey = req.get("Idempotency-Key") || ""
|
const headerKey = req.get("Idempotency-Key") || ""
|
||||||
|
|
||||||
@@ -284,7 +286,7 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
res.status(idempotencyKey.response_code).json(idempotencyKey.response_body)
|
res.status(idempotencyKey.response_code).json(idempotencyKey.response_body)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err)
|
logger.log(err)
|
||||||
throw err
|
throw err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { CartService, IdempotencyKeyService } from "../../../../services"
|
|||||||
import { EntityManager } from "typeorm"
|
import { EntityManager } from "typeorm"
|
||||||
import { IdempotencyKey } from "../../../../models/idempotency-key"
|
import { IdempotencyKey } from "../../../../models/idempotency-key"
|
||||||
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @oas [post] /store/carts/{id}/taxes
|
* @oas [post] /store/carts/{id}/taxes
|
||||||
@@ -49,6 +50,7 @@ export default async (req, res) => {
|
|||||||
"idempotencyKeyService"
|
"idempotencyKeyService"
|
||||||
)
|
)
|
||||||
const manager: EntityManager = req.scope.resolve("manager")
|
const manager: EntityManager = req.scope.resolve("manager")
|
||||||
|
const logger: Logger = req.scope.resolve("logger")
|
||||||
|
|
||||||
const headerKey = req.get("Idempotency-Key") || ""
|
const headerKey = req.get("Idempotency-Key") || ""
|
||||||
|
|
||||||
@@ -61,7 +63,7 @@ export default async (req, res) => {
|
|||||||
.initializeRequest(headerKey, req.method, req.params, req.path)
|
.initializeRequest(headerKey, req.method, req.params, req.path)
|
||||||
})
|
})
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error)
|
logger.log(error)
|
||||||
res.status(409).send("Failed to create idempotency key")
|
res.status(409).send("Failed to create idempotency key")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { AbstractCartCompletionStrategy } from "../../../../interfaces"
|
|||||||
import { IdempotencyKey } from "../../../../models"
|
import { IdempotencyKey } from "../../../../models"
|
||||||
import { IdempotencyKeyService } from "../../../../services"
|
import { IdempotencyKeyService } from "../../../../services"
|
||||||
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
import { cleanResponseData } from "../../../../utils/clean-response-data"
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @oas [post] /store/carts/{id}/complete
|
* @oas [post] /store/carts/{id}/complete
|
||||||
@@ -66,6 +67,7 @@ export default async (req, res) => {
|
|||||||
const idempotencyKeyService: IdempotencyKeyService = req.scope.resolve(
|
const idempotencyKeyService: IdempotencyKeyService = req.scope.resolve(
|
||||||
"idempotencyKeyService"
|
"idempotencyKeyService"
|
||||||
)
|
)
|
||||||
|
const logger: Logger = req.scope.resolve("logger")
|
||||||
|
|
||||||
const headerKey = req.get("Idempotency-Key") || ""
|
const headerKey = req.get("Idempotency-Key") || ""
|
||||||
|
|
||||||
@@ -77,7 +79,7 @@ export default async (req, res) => {
|
|||||||
.initializeRequest(headerKey, req.method, req.params, req.path)
|
.initializeRequest(headerKey, req.method, req.params, req.path)
|
||||||
})
|
})
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error)
|
logger.log(error)
|
||||||
res.status(409).send("Failed to create idempotency key")
|
res.status(409).send("Failed to create idempotency key")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { defaultStoreGiftCardFields, defaultStoreGiftCardRelations } from "."
|
import { defaultStoreGiftCardFields, defaultStoreGiftCardRelations } from "."
|
||||||
|
|
||||||
import GiftCardService from "../../../../services/gift-card"
|
import GiftCardService from "../../../../services/gift-card"
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @oas [get] /store/gift-cards/{code}
|
* @oas [get] /store/gift-cards/{code}
|
||||||
@@ -58,7 +59,8 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
res.json({ gift_card: giftCard })
|
res.json({ gift_card: giftCard })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error)
|
const logger: Logger = req.scope.resolve("logger")
|
||||||
|
logger.log(error)
|
||||||
throw error
|
throw error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,7 @@ import IdempotencyKeyService from "../../../../services/idempotency-key"
|
|||||||
import ReturnService from "../../../../services/return"
|
import ReturnService from "../../../../services/return"
|
||||||
import { validator } from "../../../../utils/validator"
|
import { validator } from "../../../../utils/validator"
|
||||||
import { defaultRelations } from "."
|
import { defaultRelations } from "."
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @oas [post] /store/returns
|
* @oas [post] /store/returns
|
||||||
@@ -225,7 +226,8 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
res.status(idempotencyKey.response_code).json(idempotencyKey.response_body)
|
res.status(idempotencyKey.response_code).json(idempotencyKey.response_body)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err)
|
const logger: Logger = req.scope.resolve("logger")
|
||||||
|
logger.log(err)
|
||||||
throw err
|
throw err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { createDefaultRuleTypes } from "./utils/create-default-rule-types"
|
|||||||
import dotenv from "dotenv"
|
import dotenv from "dotenv"
|
||||||
import express from "express"
|
import express from "express"
|
||||||
import loaders from "../loaders"
|
import loaders from "../loaders"
|
||||||
|
import Logger from "../loaders/logger"
|
||||||
|
|
||||||
dotenv.config()
|
dotenv.config()
|
||||||
|
|
||||||
@@ -18,10 +19,10 @@ const migrate = async function ({ directory }) {
|
|||||||
|
|
||||||
migrate({ directory: process.cwd() })
|
migrate({ directory: process.cwd() })
|
||||||
.then(() => {
|
.then(() => {
|
||||||
console.log("Created default rule types")
|
Logger.log("Created default rule types")
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
console.log("Failed to create rule types")
|
Logger.log("Failed to create rule types")
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
})
|
})
|
||||||
@@ -2,7 +2,11 @@ import dotenv from "dotenv"
|
|||||||
import { DataSource } from "typeorm"
|
import { DataSource } from "typeorm"
|
||||||
import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"
|
import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"
|
||||||
import Logger from "../loaders/logger"
|
import Logger from "../loaders/logger"
|
||||||
import { DiscountCondition, DiscountConditionOperator, DiscountConditionType, } from "../models/discount-condition"
|
import {
|
||||||
|
DiscountCondition,
|
||||||
|
DiscountConditionOperator,
|
||||||
|
DiscountConditionType,
|
||||||
|
} from "../models/discount-condition"
|
||||||
import { DiscountConditionProduct } from "../models/discount-condition-product"
|
import { DiscountConditionProduct } from "../models/discount-condition-product"
|
||||||
import { DiscountRule } from "../models/discount-rule"
|
import { DiscountRule } from "../models/discount-rule"
|
||||||
import { DiscountConditionRepository } from "../repositories/discount-condition"
|
import { DiscountConditionRepository } from "../repositories/discount-condition"
|
||||||
@@ -123,6 +127,6 @@ migrate({ typeormConfig })
|
|||||||
Logger.info("Database migration completed successfully")
|
Logger.info("Database migration completed successfully")
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
.catch((err) => console.log(err))
|
.catch((err) => Logger.log(err))
|
||||||
|
|
||||||
export default migrate
|
export default migrate
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
import dotenv from "dotenv"
|
import dotenv from "dotenv"
|
||||||
import { createConnection, SelectQueryBuilder } from "typeorm"
|
import { createConnection, SelectQueryBuilder } from "typeorm"
|
||||||
import Logger from "../loaders/logger"
|
|
||||||
import { LineItem } from "../models/line-item"
|
import { LineItem } from "../models/line-item"
|
||||||
import { LineItemAdjustment } from "../models/line-item-adjustment"
|
import { LineItemAdjustment } from "../models/line-item-adjustment"
|
||||||
import { typeormConfig } from "./db-config"
|
import { typeormConfig } from "./db-config"
|
||||||
|
import Logger from "../loaders/logger"
|
||||||
|
|
||||||
dotenv.config()
|
dotenv.config()
|
||||||
|
|
||||||
const migrate = async function({ typeormConfig }) {
|
const migrate = async function ({ typeormConfig }) {
|
||||||
const connection = await createConnection(typeormConfig)
|
const connection = await createConnection(typeormConfig)
|
||||||
|
|
||||||
const BATCH_SIZE = 1000
|
const BATCH_SIZE = 1000
|
||||||
@@ -98,6 +98,6 @@ migrate({ typeormConfig })
|
|||||||
Logger.info("Database migration completed successfully")
|
Logger.info("Database migration completed successfully")
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
.catch((err) => console.log(err))
|
.catch((err) => Logger.log(err))
|
||||||
|
|
||||||
export default migrate
|
export default migrate
|
||||||
@@ -11,6 +11,7 @@ import dotenv from "dotenv"
|
|||||||
import express from "express"
|
import express from "express"
|
||||||
import loaders from "../loaders"
|
import loaders from "../loaders"
|
||||||
import { promiseAll } from "@medusajs/utils"
|
import { promiseAll } from "@medusajs/utils"
|
||||||
|
import Logger from "../loaders/logger"
|
||||||
|
|
||||||
dotenv.config()
|
dotenv.config()
|
||||||
|
|
||||||
@@ -133,7 +134,7 @@ const migrate = async function ({ directory }) {
|
|||||||
await processBatch(variants, defaultLocationId, container)
|
await processBatch(variants, defaultLocationId, container)
|
||||||
|
|
||||||
let processedCount = variants.length
|
let processedCount = variants.length
|
||||||
console.log(`Processed ${processedCount} of ${totalCount}`)
|
Logger.log(`Processed ${processedCount} of ${totalCount}`)
|
||||||
while (processedCount < totalCount) {
|
while (processedCount < totalCount) {
|
||||||
const nextBatch = await variantService.list(
|
const nextBatch = await variantService.list(
|
||||||
{},
|
{},
|
||||||
@@ -147,10 +148,10 @@ const migrate = async function ({ directory }) {
|
|||||||
await processBatch(nextBatch, defaultLocationId, container)
|
await processBatch(nextBatch, defaultLocationId, container)
|
||||||
|
|
||||||
processedCount += nextBatch.length
|
processedCount += nextBatch.length
|
||||||
console.log(`Processed ${processedCount} of ${totalCount}`)
|
Logger.log(`Processed ${processedCount} of ${totalCount}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Done")
|
Logger.log("Done")
|
||||||
process.exit(0)
|
process.exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -80,6 +80,6 @@ migrate({ typeormConfig })
|
|||||||
Logger.info("Database migration completed successfully")
|
Logger.info("Database migration completed successfully")
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
.catch((err) => console.log(err))
|
.catch((err) => Logger.log(err))
|
||||||
|
|
||||||
export default migrate
|
export default migrate
|
||||||
@@ -3,6 +3,7 @@ import { MedusaError, promiseAll } from "@medusajs/utils"
|
|||||||
|
|
||||||
import { ProductVariantService } from "../../services"
|
import { ProductVariantService } from "../../services"
|
||||||
import dotenv from "dotenv"
|
import dotenv from "dotenv"
|
||||||
|
import Logger from "../../loaders/logger"
|
||||||
|
|
||||||
dotenv.config()
|
dotenv.config()
|
||||||
|
|
||||||
@@ -78,6 +79,6 @@ export const migrateProductVariantPricing = async function (
|
|||||||
await link.create(links)
|
await link.create(links)
|
||||||
|
|
||||||
processedCount += variants.length
|
processedCount += variants.length
|
||||||
console.log(`Processed ${processedCount} of ${totalCount}`)
|
Logger.log(`Processed ${processedCount} of ${totalCount}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,11 +5,13 @@ import { TransactionBaseService } from "../interfaces"
|
|||||||
import UserService from "./user"
|
import UserService from "./user"
|
||||||
import CustomerService from "./customer"
|
import CustomerService from "./customer"
|
||||||
import { EntityManager } from "typeorm"
|
import { EntityManager } from "typeorm"
|
||||||
|
import { Logger } from "@medusajs/types"
|
||||||
|
|
||||||
type InjectedDependencies = {
|
type InjectedDependencies = {
|
||||||
manager: EntityManager
|
manager: EntityManager
|
||||||
userService: UserService
|
userService: UserService
|
||||||
customerService: CustomerService
|
customerService: CustomerService
|
||||||
|
logger: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -18,13 +20,15 @@ type InjectedDependencies = {
|
|||||||
class AuthService extends TransactionBaseService {
|
class AuthService extends TransactionBaseService {
|
||||||
protected readonly userService_: UserService
|
protected readonly userService_: UserService
|
||||||
protected readonly customerService_: CustomerService
|
protected readonly customerService_: CustomerService
|
||||||
|
protected readonly logger_: Logger
|
||||||
|
|
||||||
constructor({ userService, customerService }: InjectedDependencies) {
|
constructor({ userService, customerService, logger }: InjectedDependencies) {
|
||||||
// eslint-disable-next-line prefer-rest-params
|
// eslint-disable-next-line prefer-rest-params
|
||||||
super(arguments[0])
|
super(arguments[0])
|
||||||
|
|
||||||
this.userService_ = userService
|
this.userService_ = userService
|
||||||
this.customerService_ = customerService
|
this.customerService_ = customerService
|
||||||
|
this.logger_ = logger
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,7 +110,7 @@ class AuthService extends TransactionBaseService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("error ->", error)
|
this.logger_.log("error ->", error)
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ class NotificationService extends TransactionBaseService {
|
|||||||
return promiseAll(
|
return promiseAll(
|
||||||
subs.map(async (providerId) => {
|
subs.map(async (providerId) => {
|
||||||
return this.send(eventName, data, providerId).catch((err) => {
|
return this.send(eventName, data, providerId).catch((err) => {
|
||||||
console.log(err)
|
this.logger_.log(err)
|
||||||
this.logger_.warn(
|
this.logger_.warn(
|
||||||
`An error occured while ${providerId} was processing a notification for ${eventName}: ${err.message}`
|
`An error occured while ${providerId} was processing a notification for ${eventName}: ${err.message}`
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in new issue
Block a user