Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
e7d5f7b9
Commit
e7d5f7b9
authored
Jan 27, 2020
by
Janos Guljas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle error and Stringer implicitly in jsonhttp Respond
parent
2b5b0ea9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
7 deletions
+22
-7
pingpong.go
pkg/api/pingpong.go
+1
-1
peer.go
pkg/debugapi/peer.go
+2
-2
jsonhttp.go
pkg/jsonhttp/jsonhttp.go
+19
-4
No files found.
pkg/api/pingpong.go
View file @
e7d5f7b9
...
...
@@ -30,7 +30,7 @@ func (s *server) pingpongHandler(w http.ResponseWriter, r *http.Request) {
return
}
s
.
Logger
.
Errorf
(
"pingpong: ping %s: %w"
,
peerID
,
err
)
jsonhttp
.
InternalServerError
(
w
,
err
.
Error
()
)
jsonhttp
.
InternalServerError
(
w
,
err
)
return
}
s
.
metrics
.
PingRequestCount
.
Inc
()
...
...
pkg/debugapi/peer.go
View file @
e7d5f7b9
...
...
@@ -20,14 +20,14 @@ func (s *server) peerConnectHandler(w http.ResponseWriter, r *http.Request) {
addr
,
err
:=
multiaddr
.
NewMultiaddr
(
"/"
+
mux
.
Vars
(
r
)[
"multi-address"
])
if
err
!=
nil
{
s
.
Logger
.
Debugf
(
"debug api: peer connect: parse multiaddress: %w"
,
err
)
jsonhttp
.
BadRequest
(
w
,
err
.
Error
()
)
jsonhttp
.
BadRequest
(
w
,
err
)
return
}
address
,
err
:=
s
.
P2P
.
Connect
(
r
.
Context
(),
addr
)
if
err
!=
nil
{
s
.
Logger
.
Errorf
(
"debug api: peer connect: %w"
,
err
)
jsonhttp
.
InternalServerError
(
w
,
err
.
Error
()
)
jsonhttp
.
InternalServerError
(
w
,
err
)
return
}
...
...
pkg/jsonhttp/jsonhttp.go
View file @
e7d5f7b9
...
...
@@ -38,10 +38,25 @@ func Respond(w http.ResponseWriter, statusCode int, response interface{}) {
Message
:
http
.
StatusText
(
statusCode
),
Code
:
statusCode
,
}
}
else
if
message
,
ok
:=
response
.
(
string
);
ok
{
response
=
&
StatusResponse
{
Message
:
message
,
Code
:
statusCode
,
}
else
{
switch
message
:=
response
.
(
type
)
{
case
string
:
response
=
&
StatusResponse
{
Message
:
message
,
Code
:
statusCode
,
}
case
error
:
response
=
&
StatusResponse
{
Message
:
message
.
Error
(),
Code
:
statusCode
,
}
case
interface
{
String
()
string
}
:
response
=
&
StatusResponse
{
Message
:
message
.
String
(),
Code
:
statusCode
,
}
}
}
var
b
bytes
.
Buffer
...
...
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