De-duplicate code #387
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "errors" | ||
| "io" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/docker/model-runner/pkg/internal/utils" | ||
| "github.com/docker/model-runner/pkg/logging" | ||
| "github.com/docker/model-runner/pkg/sandbox" | ||
| ) | ||
|
|
||
| // SanitizedArgsLog logs command arguments with sanitization for safe logging | ||
| func SanitizedArgsLog(log logging.Logger, label string, args []string) { | ||
| sanitizedArgs := make([]string, len(args)) | ||
| for i, arg := range args { | ||
| sanitizedArgs[i] = utils.SanitizeForLog(arg) | ||
| } | ||
| log.Infof("%s: %v", label, sanitizedArgs) | ||
| } | ||
|
|
||
| // HandleSocketCleanup removes the socket file at the given path, ignoring if it doesn't exist | ||
| func HandleSocketCleanup(socket string) error { | ||
| if err := os.RemoveAll(socket); err != nil && !errors.Is(err, os.ErrNotExist) { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // ProcessExitHandler handles the exit of a backend process and captures its output | ||
| func ProcessExitHandler( | ||
| log logging.Logger, | ||
| sandboxInstance sandbox.Sandbox, | ||
| tailBuf io.ReadWriter, | ||
| serverLogStream io.Closer, | ||
| socket string, | ||
| ) error { | ||
| serverLogStream.Close() | ||
|
|
||
| errOutput := new(strings.Builder) | ||
| if _, err := io.Copy(errOutput, tailBuf); err != nil { | ||
| log.Warnf("failed to read server output tail: %v", err) | ||
| } | ||
|
|
||
| cmdErr := sandboxInstance.Command().Wait() | ||
| outputStr := errOutput.String() | ||
| if len(outputStr) != 0 { | ||
| return &BackendExitError{ | ||
| Err: cmdErr, | ||
| Output: outputStr, | ||
| } | ||
| } else { | ||
| return cmdErr | ||
| } | ||
| } | ||
|
|
||
| // BackendExitError represents an error when a backend process exits | ||
| type BackendExitError struct { | ||
| Err error | ||
| Output string | ||
| } | ||
|
|
||
| func (e *BackendExitError) Error() string { | ||
| if e.Output != "" { | ||
| return e.Err.Error() + "\nwith output: " + e.Output | ||
| } | ||
| return e.Err.Error() | ||
| } | ||
|
|
||
| // SplitArgs splits a string into arguments, respecting quoted arguments | ||
| func SplitArgs(s string) []string { | ||
| var args []string | ||
| var currentArg strings.Builder | ||
| inQuotes := false | ||
|
|
||
| for _, r := range s { | ||
| switch { | ||
| case r == '"' || r == '\'': | ||
| inQuotes = !inQuotes | ||
| case r == ' ' && !inQuotes: | ||
| if currentArg.Len() > 0 { | ||
| args = append(args, currentArg.String()) | ||
| currentArg.Reset() | ||
| } | ||
| default: | ||
| currentArg.WriteRune(r) | ||
| } | ||
| } | ||
|
|
||
| if currentArg.Len() > 0 { | ||
| args = append(args, currentArg.String()) | ||
| } | ||
|
|
||
| return args | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The call to
common.HandleSocketCleanup(socket)on lines 210-212 appears to be redundant, as thesocketvariable is already passed tocommon.ProcessExitHandleron line 207. This implies thatProcessExitHandleris responsible for the socket cleanup.To avoid duplicate operations and improve clarity, the explicit cleanup call should be removed. If
ProcessExitHandlerdoes not handle cleanup, its signature should be changed to not accept asocketparameter.