Skip to content

Commit 7c7632d

Browse files
committed
either use structured logs or stdout, never both
1 parent acc37d3 commit 7c7632d

File tree

1 file changed

+58
-58
lines changed

1 file changed

+58
-58
lines changed

apps/webapp/app/db.server.ts

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,20 @@ function getClient() {
137137
level: "warn",
138138
},
139139
// stdout
140-
{
141-
emit: "stdout",
142-
level: "info",
143-
},
144-
{
145-
emit: "stdout",
146-
level: "warn",
147-
},
148-
...((process.env.PRISMA_ERRORS_STDOUT_ENABLED === "1"
140+
...((process.env.PRISMA_LOG_TO_STDOUT === "1"
149141
? [
150142
{
151143
emit: "stdout",
152144
level: "error",
153145
},
146+
{
147+
emit: "stdout",
148+
level: "info",
149+
},
150+
{
151+
emit: "stdout",
152+
level: "warn",
153+
},
154154
]
155155
: []) satisfies Prisma.LogDefinition[]),
156156
// verbose
@@ -169,30 +169,30 @@ function getClient() {
169169
],
170170
});
171171

172-
client.$on("info", (log) => {
173-
logger.info("PrismaClient info", {
174-
clientType: "writer",
175-
event: {
176-
timestamp: log.timestamp,
177-
message: log.message,
178-
target: log.target,
179-
},
172+
// Only use structured logging if we're not already logging to stdout
173+
if (process.env.PRISMA_LOG_TO_STDOUT !== "1") {
174+
client.$on("info", (log) => {
175+
logger.info("PrismaClient info", {
176+
clientType: "writer",
177+
event: {
178+
timestamp: log.timestamp,
179+
message: log.message,
180+
target: log.target,
181+
},
182+
});
180183
});
181-
});
182184

183-
client.$on("warn", (log) => {
184-
logger.warn("PrismaClient warn", {
185-
clientType: "writer",
186-
event: {
187-
timestamp: log.timestamp,
188-
message: log.message,
189-
target: log.target,
190-
},
185+
client.$on("warn", (log) => {
186+
logger.warn("PrismaClient warn", {
187+
clientType: "writer",
188+
event: {
189+
timestamp: log.timestamp,
190+
message: log.message,
191+
target: log.target,
192+
},
193+
});
191194
});
192-
});
193195

194-
// Only use structured logging for errors if we're not already logging them to stdout
195-
if (process.env.PRISMA_ERRORS_STDOUT_ENABLED !== "1") {
196196
client.$on("error", (log) => {
197197
logger.error("PrismaClient error", {
198198
clientType: "writer",
@@ -248,20 +248,20 @@ function getReplicaClient() {
248248
level: "warn",
249249
},
250250
// stdout
251-
{
252-
emit: "stdout",
253-
level: "info",
254-
},
255-
{
256-
emit: "stdout",
257-
level: "warn",
258-
},
259-
...((process.env.PRISMA_ERRORS_STDOUT_ENABLED === "1"
251+
...((process.env.PRISMA_LOG_TO_STDOUT === "1"
260252
? [
261253
{
262254
emit: "stdout",
263255
level: "error",
264256
},
257+
{
258+
emit: "stdout",
259+
level: "info",
260+
},
261+
{
262+
emit: "stdout",
263+
level: "warn",
264+
},
265265
]
266266
: []) satisfies Prisma.LogDefinition[]),
267267
// verbose
@@ -280,30 +280,30 @@ function getReplicaClient() {
280280
],
281281
});
282282

283-
replicaClient.$on("info", (log) => {
284-
logger.info("PrismaClient info", {
285-
clientType: "reader",
286-
event: {
287-
timestamp: log.timestamp,
288-
message: log.message,
289-
target: log.target,
290-
},
283+
// Only use structured logging if we're not already logging to stdout
284+
if (process.env.PRISMA_LOG_TO_STDOUT !== "1") {
285+
replicaClient.$on("info", (log) => {
286+
logger.info("PrismaClient info", {
287+
clientType: "reader",
288+
event: {
289+
timestamp: log.timestamp,
290+
message: log.message,
291+
target: log.target,
292+
},
293+
});
291294
});
292-
});
293295

294-
replicaClient.$on("warn", (log) => {
295-
logger.warn("PrismaClient warn", {
296-
clientType: "reader",
297-
event: {
298-
timestamp: log.timestamp,
299-
message: log.message,
300-
target: log.target,
301-
},
296+
replicaClient.$on("warn", (log) => {
297+
logger.warn("PrismaClient warn", {
298+
clientType: "reader",
299+
event: {
300+
timestamp: log.timestamp,
301+
message: log.message,
302+
target: log.target,
303+
},
304+
});
302305
});
303-
});
304306

305-
// Only use structured logging for errors if we're not already logging them to stdout
306-
if (process.env.PRISMA_ERRORS_STDOUT_ENABLED !== "1") {
307307
replicaClient.$on("error", (log) => {
308308
logger.error("PrismaClient error", {
309309
clientType: "reader",

0 commit comments

Comments
 (0)