From 335eb3ed8df2b2b2391cf0ea92faf999cbaa6372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Le=C3=9Fmann=20=28=40MarkL4YG=29?= Date: Sat, 23 Nov 2024 21:03:12 +0100 Subject: [PATCH] experiment: Increase logging based on PR label --- .github/workflows/build.yml | 14 ++++++++- build.gradle.kts | 8 +++++ .../certassist/openssl/OpenSSLService.java | 31 +++++++++---------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b63320..f7f5bc1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,18 @@ jobs: with: distribution: 'temurin' java-version: 21 + - name: Update environment variables based on PR labels + id: pr-env + uses: actions/github-script@v7 + with: + script: | + const labels = context.payload.pull_request.labels.map(label => label.name); + console.log('PR labels:', labels); + const springDebug = labels.includes('pr-debug'); + return { SPRING_DEBUG: '' + springDebug }; + result-encoding: json - uses: gradle/actions/setup-gradle@v4 - name: Build gradle project - run: ./gradlew build \ No newline at end of file + run: ./gradlew build + env: + ORG_GRADLE_PROJECT_SPRING_DEBUG: ${{ fromJSON(steps.pr-env.outputs.result).SPRING_DEBUG }} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 12fdfda..0ad924f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,7 @@ plugins { group = "io.github.markl4yg.hca" version = "0.0.1-SNAPSHOT" +val springDebugLogging = providers.gradleProperty("SPRING_DEBUG").orNull == "true" apply( from = file("./gradle/spotless.gradle") @@ -57,6 +58,13 @@ dependencies { tasks.withType { useJUnitPlatform() + if (springDebugLogging) { + // Additional Hibernate logging + jvmArgs("-Dlogging.level.org.sqlite=DEBUG") + jvmArgs("-Dlogging.level.org.hibernate=DEBUG") + jvmArgs("-Dhibernate.show_sql=true") + jvmArgs("-Dhibernate.format_sql=true") + } systemProperty("spring.profiles.active", "test") jvmArgs("-XX:+EnableDynamicAgentLoading") // DynamicAgentLoading for byteBuddy within Mockito diff --git a/src/main/java/de/mlessmann/certassist/openssl/OpenSSLService.java b/src/main/java/de/mlessmann/certassist/openssl/OpenSSLService.java index 5286e35..eb5aa94 100644 --- a/src/main/java/de/mlessmann/certassist/openssl/OpenSSLService.java +++ b/src/main/java/de/mlessmann/certassist/openssl/OpenSSLService.java @@ -1,5 +1,9 @@ package de.mlessmann.certassist.openssl; +import static de.mlessmann.certassist.Constants.CERTASSIST_TMP_PREFIX; +import static java.util.concurrent.TimeUnit.*; +import static org.slf4j.LoggerFactory.getLogger; + import de.mlessmann.certassist.DeleteRecursiveFileVisitor; import de.mlessmann.certassist.except.CommandLineOperationException; import de.mlessmann.certassist.except.UnresolvableCLIDependency; @@ -9,18 +13,6 @@ import de.mlessmann.certassist.models.CertificateInfoExtension; import de.mlessmann.certassist.models.CertificateInfoSubject; import de.mlessmann.certassist.models.CertificateInfoSubject.CertificateInfoSubjectBuilder; import de.mlessmann.certassist.service.ExecutableResolver; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.springframework.lang.NonNull; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.zeroturnaround.exec.ProcessExecutor; -import org.zeroturnaround.exec.ProcessResult; -import org.zeroturnaround.exec.StartedProcess; -import org.zeroturnaround.exec.stream.slf4j.Slf4jStream; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -36,10 +28,17 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - -import static de.mlessmann.certassist.Constants.CERTASSIST_TMP_PREFIX; -import static java.util.concurrent.TimeUnit.*; -import static org.slf4j.LoggerFactory.getLogger; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.zeroturnaround.exec.ProcessExecutor; +import org.zeroturnaround.exec.ProcessResult; +import org.zeroturnaround.exec.StartedProcess; +import org.zeroturnaround.exec.stream.slf4j.Slf4jStream; @Service @RequiredArgsConstructor