Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
c8fd650e
Commit
c8fd650e
authored
Jul 01, 2019
by
Sietse Ringers
Browse files
fix: don't log HTTP protocol version (which is always 1.1)
parent
4e1ee035
Changes
3
Hide whitespace changes
Inline
Side-by-side
internal/servercore/api.go
View file @
c8fd650e
...
...
@@ -291,7 +291,7 @@ func (s *Server) HandleProtocolMessage(
var
start
time
.
Time
if
s
.
conf
.
Verbose
>=
2
{
start
=
time
.
Now
()
server
.
LogRequest
(
"client"
,
method
,
path
,
""
,
""
,
http
.
Header
(
headers
),
message
)
server
.
LogRequest
(
"client"
,
method
,
path
,
""
,
http
.
Header
(
headers
),
message
)
}
status
,
output
,
result
:=
s
.
handleProtocolMessage
(
path
,
method
,
headers
,
message
)
...
...
server/api.go
View file @
c8fd650e
...
...
@@ -397,7 +397,7 @@ func LogWarning(err error) error {
return
log
(
logrus
.
WarnLevel
,
err
)
}
func
LogRequest
(
typ
,
method
,
url
,
proto
,
from
string
,
headers
http
.
Header
,
message
[]
byte
)
{
func
LogRequest
(
typ
,
method
,
url
,
from
string
,
headers
http
.
Header
,
message
[]
byte
)
{
fields
:=
logrus
.
Fields
{
"type"
:
typ
,
"method"
:
method
,
...
...
@@ -409,9 +409,6 @@ func LogRequest(typ, method, url, proto, from string, headers http.Header, messa
if
len
(
message
)
>
0
{
fields
[
"message"
]
=
string
(
message
)
}
if
proto
!=
""
{
fields
[
"proto"
]
=
proto
}
if
from
!=
""
{
fields
[
"from"
]
=
from
}
...
...
server/requestorserver/server.go
View file @
c8fd650e
...
...
@@ -236,7 +236,7 @@ func (s *Server) logHandler(typ string, logResponse, logHeaders, logFrom bool) f
if
logFrom
{
from
=
r
.
RemoteAddr
}
server
.
LogRequest
(
typ
,
r
.
Method
,
r
.
URL
.
String
(),
r
.
Proto
,
from
,
headers
,
message
)
server
.
LogRequest
(
typ
,
r
.
Method
,
r
.
URL
.
String
(),
from
,
headers
,
message
)
// copy output of HTTP handler to our buffer for later logging
ww
:=
middleware
.
NewWrapResponseWriter
(
w
,
r
.
ProtoMajor
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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