Merge pull request #26 from gofractally/write-traces-to-console

write traces to console by default
gofractally · Feb 27, 2024 · 7682e2c · 7682e2c
2 parents 63adb85 + c779054
commit 7682e2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/_dispatcher.yml b/.github/workflows/_dispatcher.yml
@@ -61,10 +61,10 @@ jobs:
         run: |
           necessary_jobs=$(./.github/scripts/check-patterns.sh "$ALL_CHANGED_FILES")  
           read -r run_tc run_2004 run_2204 run_contrib <<< "$necessary_jobs"
-          echo "run_tc=${run_tc}" >> $GITHUB_OUTPUT
-          echo "run_2004=${run_2004}" >> $GITHUB_OUTPUT
-          echo "run_2204=${run_2204}" >> $GITHUB_OUTPUT
-          echo "run_contrib=${run_contrib}" >> $GITHUB_OUTPUT
+          echo "run_tc=${run_tc}" | tee -a $GITHUB_OUTPUT
+          echo "run_2004=${run_2004}" | tee -a $GITHUB_OUTPUT
+          echo "run_2204=${run_2204}" | tee -a $GITHUB_OUTPUT
+          echo "run_contrib=${run_contrib}" | tee -a $GITHUB_OUTPUT
 
   build-tool-config:
     name: "Build tool config"
@@ -91,7 +91,7 @@ jobs:
   build-contributor:
     name: "Build contributor"
     needs: [determine-actions, build-tool-config, build-2204]
-    if: ${{ needs.determine-actions.outputs.run_contrib == '1' }}
+    if: ${{ !cancelled() && needs.determine-actions.outputs.run_contrib == '1' }}
     uses: ./.github/workflows/contributor.yml
     with:
       new_tools: ${{ needs.build-tool-config.result == 'success'}} 

diff --git a/docker/conf/psinode/configs/http.config b/docker/conf/psinode/configs/http.config
@@ -22,7 +22,7 @@ admin-authz = rw:loopback
 [logger.stderr]
 type   = console
 filter = Severity >= info
-format = [{TimeStamp}] [{Severity}]{?: [{RemoteEndpoint}]}: {Message}{?: {TransactionId}}{?: {BlockId}}{?RequestMethod:: {RequestMethod} {RequestHost}{RequestTarget}{?: {ResponseStatus}{?: {ResponseBytes}}}}{?: {ResponseTime} µs}
+format = [{TimeStamp}] [{Severity}]{?: [{RemoteEndpoint}]}: {Message}{?: {TransactionId}}{?: {BlockId}}{?RequestMethod:: {RequestMethod} {RequestHost}{RequestTarget}{?: {ResponseStatus}{?: {ResponseBytes}}}}{?: {ResponseTime} µs}{Indent:4:{TraceConsole}}
 
 # Log all HTTP reqests to a separate file
 [logger.http]

diff --git a/docker/conf/psinode/configs/https.config b/docker/conf/psinode/configs/https.config
@@ -25,7 +25,7 @@ admin-authz = rw:loopback
 [logger.stderr]
 type   = console
 filter = Severity >= info
-format = [{TimeStamp}] [{Severity}]{?: [{RemoteEndpoint}]}: {Message}{?: {TransactionId}}{?: {BlockId}}{?RequestMethod:: {RequestMethod} {RequestHost}{RequestTarget}{?: {ResponseStatus}{?: {ResponseBytes}}}}{?: {ResponseTime} µs}
+format = [{TimeStamp}] [{Severity}]{?: [{RemoteEndpoint}]}: {Message}{?: {TransactionId}}{?: {BlockId}}{?RequestMethod:: {RequestMethod} {RequestHost}{RequestTarget}{?: {ResponseStatus}{?: {ResponseBytes}}}}{?: {ResponseTime} µs}{Indent:4:{TraceConsole}}
 
 # Log all HTTP reqests to a separate file
 [logger.http]