fix(*): use process.env value or default for RUST_LOG RUST_BACKTRACE (#…

…14074) * fix(*): use process.env value or default for RUST_LOG RUST_BACKTRACE closes #13931 * remove SERVER_ROOT
prisma · Jul 18, 2022 · f8b8d38 · f8b8d38
1 parent 2b7c796
commit f8b8d38
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/packages/engine-core/src/binary/BinaryEngine.ts b/packages/engine-core/src/binary/BinaryEngine.ts
@@ -489,12 +489,9 @@ ${chalk.dim("In case we're mistaken, please report this to us 🙏.")}`)
   private getEngineEnvVars() {
     const env: any = {
       PRISMA_DML_PATH: this.datamodelPath,
-      RUST_BACKTRACE: '1',
-      RUST_LOG: 'info',
     }
 
     if (this.logQueries || this.logLevel === 'info') {
-      env.RUST_LOG = 'info'
       if (this.logQueries) {
         env.LOG_QUERIES = 'true'
       }
@@ -512,6 +509,9 @@ ${chalk.dim("In case we're mistaken, please report this to us 🙏.")}`)
       ...this.env, // user-provided env vars
       ...process.env,
       ...env,
+      // use value from process.env or use default
+      RUST_BACKTRACE: process.env.RUST_BACKTRACE ?? '1',
+      RUST_LOG: process.env.RUST_LOG ?? 'info',
     }
   }
 

diff --git a/packages/internals/src/engine-commands/formatSchema.ts b/packages/internals/src/engine-commands/formatSchema.ts
@@ -24,7 +24,7 @@ export async function formatSchema({ schemaPath, schema }: { schemaPath?: string
 
   const options = {
     env: {
-      RUST_BACKTRACE: '1',
+      RUST_BACKTRACE: process.env.RUST_BACKTRACE ?? '1',
       ...(showColors ? { CLICOLOR_FORCE: '1' } : {}),
     },
     maxBuffer: MAX_BUFFER,

diff --git a/packages/internals/src/engine-commands/getDmmf.ts b/packages/internals/src/engine-commands/getDmmf.ts
@@ -278,7 +278,7 @@ async function getDmmfBinary(options: GetDMMFOptions): Promise<DMMF.Document> {
            * to serialize big datamodels.
            */
           PRISMA_DML_PATH: tempDatamodelPath,
-          RUST_BACKTRACE: '1',
+          RUST_BACKTRACE: process.env.RUST_BACKTRACE ?? '1',
           ...(process.env.NO_COLOR ? {} : { CLICOLOR_FORCE: '1' }),
         },
         maxBuffer: MAX_BUFFER,

diff --git a/packages/internals/src/migrateEngineCommands.ts b/packages/internals/src/migrateEngineCommands.ts
@@ -190,8 +190,8 @@ export async function execaCommand({
     return await execa(migrationEnginePath, ['cli', '--datasource', connectionString, engineCommandName], {
       cwd,
       env: {
-        RUST_BACKTRACE: '1',
-        RUST_LOG: 'info',
+        RUST_BACKTRACE: process.env.RUST_BACKTRACE ?? '1',
+        RUST_LOG: process.env.RUST_LOG ?? 'info',
       },
     })
   } catch (_e) {

diff --git a/packages/migrate/src/MigrateEngine.ts b/packages/migrate/src/MigrateEngine.ts
@@ -172,7 +172,7 @@ export class MigrateEngine {
     return new Promise(async (resolve, reject) => {
       try {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { PWD, ...rest } = process.env
+        const { PWD, ...processEnv } = process.env
         const binaryPath = await resolveBinary(BinaryType.migrationEngine)
         debugRpc('starting migration engine with binary: ' + binaryPath)
         const args: string[] = []
@@ -192,10 +192,11 @@ export class MigrateEngine {
           cwd: this.projectDir,
           stdio: ['pipe', 'pipe', this.debug ? process.stderr : 'pipe'],
           env: {
-            ...rest,
-            SERVER_ROOT: this.projectDir,
+            // The following environment variables can be overridden by the user.
             RUST_LOG: 'info',
             RUST_BACKTRACE: '1',
+            // Take env values from process.env (willl override values set before)
+            ...processEnv,
           },
         })