diff --git a/CHANGELOG.md b/CHANGELOG.md index 996f1aec6..f1ba768d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added multi-branch indexing support for Gerrit. [#433](https://github.com/sourcebot-dev/sourcebot/pull/433) +### Fixed +- Removed prefix from structured log output. [#443](https://github.com/sourcebot-dev/sourcebot/pull/443) + ## [4.6.3] - 2025-08-04 ### Fixed diff --git a/prefix-output.sh b/prefix-output.sh index 0364bfd7c..7cd3f8200 100644 --- a/prefix-output.sh +++ b/prefix-output.sh @@ -1,7 +1,15 @@ #!/bin/sh # @see : https://github.com/Supervisor/supervisor/issues/553#issuecomment-1353523182 -exec 1> >( perl -ne '$| = 1; print "['"${SUPERVISOR_PROCESS_NAME}"'] | $_"' >&1) -exec 2> >( perl -ne '$| = 1; print "['"${SUPERVISOR_PROCESS_NAME}"'] | $_"' >&2) -exec "$@" \ No newline at end of file +# Check if structured logging is enabled +if [ "${SOURCEBOT_STRUCTURED_LOGGING_ENABLED}" = "true" ]; then + # Don't prefix output, just execute the command directly + exec "$@" +else + # Apply prefix to output + exec 1> >( perl -ne '$| = 1; print "['"${SUPERVISOR_PROCESS_NAME}"'] | $_"' >&1) + exec 2> >( perl -ne '$| = 1; print "['"${SUPERVISOR_PROCESS_NAME}"'] | $_"' >&2) + + exec "$@" +fi \ No newline at end of file