You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jr...@apache.org on 2023/12/18 23:29:13 UTC
(beam) branch release-2.53.0 updated: Fix nil pointer access in logRuntimeDependencies (#29804) (#29806)
This is an automated email from the ASF dual-hosted git repository.
jrmccluskey pushed a commit to branch release-2.53.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.53.0 by this push:
new 292606bdb0c Fix nil pointer access in logRuntimeDependencies (#29804) (#29806)
292606bdb0c is described below
commit 292606bdb0c8d71dded7ee4968e78bd14335936a
Author: Jack McCluskey <34...@users.noreply.github.com>
AuthorDate: Mon Dec 18 18:29:06 2023 -0500
Fix nil pointer access in logRuntimeDependencies (#29804) (#29806)
---
sdks/python/container/boot.go | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/sdks/python/container/boot.go b/sdks/python/container/boot.go
index cbf05bbd04a..c59807c72a9 100644
--- a/sdks/python/container/boot.go
+++ b/sdks/python/container/boot.go
@@ -409,7 +409,7 @@ func installSetupPackages(ctx context.Context, logger *tools.Logger, files []str
if err := pipInstallPackage(ctx, logger, files, workDir, workflowFile, false, true, nil); err != nil {
return fmt.Errorf("failed to install workflow: %v", err)
}
- if err := logRuntimeDependencies(ctx, logger); err != nil {
+ if err := logRuntimeDependencies(ctx, bufLogger); err != nil {
logger.Warnf(ctx, "couldn't fetch the runtime python dependencies: %v", err)
}
@@ -459,15 +459,14 @@ func processArtifactsInSetupOnlyMode() {
// logRuntimeDependencies logs the python dependencies
// installed in the runtime environment.
-func logRuntimeDependencies(ctx context.Context, logger *tools.Logger) error {
- logger.Printf(ctx, "Logging runtime dependencies:")
+func logRuntimeDependencies(ctx context.Context, bufLogger *tools.BufferedLogger) error {
+ bufLogger.Printf(ctx, "Logging runtime dependencies:")
pythonVersion, err := expansionx.GetPythonVersion()
if err != nil {
return err
}
- logger.Printf(ctx, "Using Python version:")
+ bufLogger.Printf(ctx, "Using Python version:")
args := []string{"--version"}
- bufLogger := tools.NewBufferedLogger(logger)
if err := execx.ExecuteEnvWithIO(nil, os.Stdin, bufLogger, bufLogger, pythonVersion, args...); err != nil {
bufLogger.FlushAtError(ctx)
} else {