Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
ba82328d
Commit
ba82328d
authored
9 years ago
by
Juan Batiz-Benet
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1270 from ipfs/fix/daemon-shutdown
do http server properly so daemon can shut down
parents
1f8230c9
f6fadc4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
core/corehttp/corehttp.go
core/corehttp/corehttp.go
+10
-5
No files found.
core/corehttp/corehttp.go
View file @
ba82328d
...
...
@@ -5,6 +5,7 @@ high-level HTTP interfaces to IPFS.
package
corehttp
import
(
"net"
"net/http"
"time"
...
...
@@ -56,12 +57,15 @@ func ListenAndServe(n *core.IpfsNode, listeningMultiAddr string, options ...Serv
}
func
listenAndServe
(
node
*
core
.
IpfsNode
,
addr
ma
.
Multiaddr
,
handler
http
.
Handler
)
error
{
_
,
host
,
err
:=
manet
.
DialArgs
(
addr
)
netarg
,
host
,
err
:=
manet
.
DialArgs
(
addr
)
if
err
!=
nil
{
return
err
}
server
:=
&
http
.
Server
{
Addr
:
host
,
Handler
:
handler
}
list
,
err
:=
net
.
Listen
(
netarg
,
host
)
if
err
!=
nil
{
return
err
}
// if the server exits beforehand
var
serverError
error
...
...
@@ -71,7 +75,7 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
defer
node
.
Children
()
.
Done
()
go
func
()
{
serverError
=
server
.
ListenA
nd
S
er
ve
(
)
serverError
=
http
.
Serve
(
list
,
ha
nd
l
er
)
close
(
serverExited
)
}()
...
...
@@ -83,14 +87,15 @@ func listenAndServe(node *core.IpfsNode, addr ma.Multiaddr, handler http.Handler
case
<-
node
.
Closing
()
:
log
.
Infof
(
"server at %s terminating..."
,
addr
)
// make sure keep-alive connections do not keep the server running
server
.
SetKeepAlivesEnabled
(
false
)
list
.
Close
()
outer
:
for
{
// wait until server exits
select
{
case
<-
serverExited
:
// if the server exited as we are closing, we really dont care about errors
serverError
=
nil
break
outer
case
<-
time
.
After
(
5
*
time
.
Second
)
:
log
.
Infof
(
"waiting for server at %s to terminate..."
,
addr
)
...
...
This diff is collapsed.
Click to expand it.
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