Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
b93f5c6f
Commit
b93f5c6f
authored
Dec 23, 2016
by
astaxie
Committed by
GitHub
Dec 23, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2311 from amrfaissal/fix-2310
Ability to register pre/post signal handlers
parents
f9791c12
eb50221a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
7 deletions
+29
-7
grace.go
grace/grace.go
+12
-4
server.go
grace/server.go
+17
-3
No files found.
grace/grace.go
View file @
b93f5c6f
...
...
@@ -85,23 +85,31 @@ var (
isChild
bool
socketOrder
string
once
sync
.
Once
hookableSignals
[]
os
.
Signal
)
func
onceInit
()
{
regLock
=
&
sync
.
Mutex
{}
func
init
()
{
flag
.
BoolVar
(
&
isChild
,
"graceful"
,
false
,
"listen on open fd (after forking)"
)
flag
.
StringVar
(
&
socketOrder
,
"socketorder"
,
""
,
"previous initialization order - used when more than one listener was started"
)
regLock
=
&
sync
.
Mutex
{}
runningServers
=
make
(
map
[
string
]
*
Server
)
runningServersOrder
=
[]
string
{}
socketPtrOffsetMap
=
make
(
map
[
string
]
uint
)
hookableSignals
=
[]
os
.
Signal
{
syscall
.
SIGHUP
,
syscall
.
SIGINT
,
syscall
.
SIGTERM
,
}
}
// NewServer returns a new graceServer.
func
NewServer
(
addr
string
,
handler
http
.
Handler
)
(
srv
*
Server
)
{
once
.
Do
(
onceInit
)
regLock
.
Lock
()
defer
regLock
.
Unlock
()
if
!
flag
.
Parsed
()
{
flag
.
Parse
()
}
...
...
grace/server.go
View file @
b93f5c6f
...
...
@@ -162,9 +162,7 @@ func (srv *Server) handleSignals() {
signal
.
Notify
(
srv
.
sigChan
,
syscall
.
SIGHUP
,
syscall
.
SIGINT
,
syscall
.
SIGTERM
,
hookableSignals
...
,
)
pid
:=
syscall
.
Getpid
()
...
...
@@ -290,3 +288,19 @@ func (srv *Server) fork() (err error) {
return
}
// RegisterSignalHook registers a function to be run PreSignal or PostSignal for a given signal.
func
(
srv
*
Server
)
RegisterSignalHook
(
ppFlag
int
,
sig
os
.
Signal
,
f
func
())
(
err
error
)
{
if
ppFlag
!=
PreSignal
&&
ppFlag
!=
PostSignal
{
err
=
fmt
.
Errorf
(
"Invalid ppFlag argument. Must be either grace.PreSignal or grace.PostSignal."
)
return
}
for
_
,
s
:=
range
hookableSignals
{
if
s
==
sig
{
srv
.
SignalHooks
[
ppFlag
][
sig
]
=
append
(
srv
.
SignalHooks
[
ppFlag
][
sig
],
f
)
return
}
}
err
=
fmt
.
Errorf
(
"Signal '%v' is not supported."
,
sig
)
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