add os.Kill signal to handle.
go fmt some code.
This commit is contained in:
@@ -68,4 +68,3 @@ func call(server string, request ApiRequest, ret interface{}) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import ()
|
||||||
)
|
|
||||||
|
|
||||||
type MountOptions struct {
|
type MountOptions struct {
|
||||||
filer *string
|
filer *string
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ func runMount(cmd *Command, args []string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
signalChan := make(chan os.Signal, 1)
|
signalChan := make(chan os.Signal, 1)
|
||||||
signal.Notify(signalChan, os.Interrupt)
|
signal.Notify(signalChan, os.Interrupt, os.Kill)
|
||||||
go func() {
|
go func() {
|
||||||
for _ = range signalChan {
|
for _ = range signalChan {
|
||||||
// sig is a ^C, handle it
|
// sig is a ^C, handle it
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ func runServer(cmd *Command, args []string) bool {
|
|||||||
|
|
||||||
// deal with control+c
|
// deal with control+c
|
||||||
signalChan := make(chan os.Signal, 1)
|
signalChan := make(chan os.Signal, 1)
|
||||||
signal.Notify(signalChan, os.Interrupt)
|
signal.Notify(signalChan, os.Interrupt, os.Kill)
|
||||||
go func() {
|
go func() {
|
||||||
for _ = range signalChan {
|
for _ = range signalChan {
|
||||||
volumeServer.Shutdown()
|
volumeServer.Shutdown()
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ func runVolume(cmd *Command, args []string) bool {
|
|||||||
|
|
||||||
// deal with control+c
|
// deal with control+c
|
||||||
signalChan := make(chan os.Signal, 1)
|
signalChan := make(chan os.Signal, 1)
|
||||||
signal.Notify(signalChan, os.Interrupt)
|
signal.Notify(signalChan, os.Interrupt, os.Kill)
|
||||||
go func() {
|
go func() {
|
||||||
for _ = range signalChan {
|
for _ = range signalChan {
|
||||||
volumeServer.Shutdown()
|
volumeServer.Shutdown()
|
||||||
|
|||||||
Reference in New Issue
Block a user