Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
702458da
Commit
702458da
authored
Mar 28, 2024
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup: LogError was removed, use LogErrorWithFields
parent
f15ab356
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
workhorse/internal/git/xblob.go
workhorse/internal/git/xblob.go
+4
-4
No files found.
workhorse/internal/git/xblob.go
View file @
702458da
...
...
@@ -75,7 +75,7 @@ func handleGetBlobRaw(a *api.API, w http.ResponseWriter, r *http.Request, repoPa
// this way it will be read one time only and next reads will be empty.
_
,
err
:=
w
.
Write
(
authReply
.
RawReply
.
Body
.
Bytes
())
if
err
!=
nil
{
helper
.
LogError
(
r
,
fmt
.
Errorf
(
"writing authReply.RawReply.Body: %v"
,
err
)
)
helper
.
LogError
WithFields
(
r
,
fmt
.
Errorf
(
"writing authReply.RawReply.Body: %v"
,
err
),
nil
)
}
return
}
...
...
@@ -234,7 +234,7 @@ func emitBlob(w http.ResponseWriter, repopath string, refpath string, r *http.Re
if
size
>
buffsize
{
_
,
err
=
io
.
CopyN
(
w
,
queryReader
,
size
-
buffsize
)
if
err
!=
nil
{
helper
.
LogError
(
r
,
fmt
.
Errorf
(
"io.CopyN: %v"
,
err
)
)
helper
.
LogError
WithFields
(
r
,
fmt
.
Errorf
(
"io.CopyN: %v"
,
err
),
nil
)
return
}
}
...
...
@@ -242,13 +242,13 @@ func emitBlob(w http.ResponseWriter, repopath string, refpath string, r *http.Re
// close git stdin explicitly, so it can exit cleanly
err
=
queryStdin
.
Close
()
if
err
!=
nil
{
helper
.
LogError
(
r
,
fmt
.
Errorf
(
"queryStdin.Close: %v"
,
err
)
)
helper
.
LogError
WithFields
(
r
,
fmt
.
Errorf
(
"queryStdin.Close: %v"
,
err
),
nil
)
return
}
err
=
queryCmd
.
Wait
()
if
err
!=
nil
{
helper
.
LogError
(
r
,
fmt
.
Errorf
(
"wait: %v"
,
err
)
)
helper
.
LogError
WithFields
(
r
,
fmt
.
Errorf
(
"wait: %v"
,
err
),
nil
)
return
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment