diff options
| author | wuyuxiang <wuyuxiang@corp.netease.com> | 2020-04-28 14:10:23 +0800 |
|---|---|---|
| committer | wuyuxiang <wuyuxiang@corp.netease.com> | 2020-04-28 14:10:23 +0800 |
| commit | 6850d28d6b99155dca2da8fa8bbf76124f528fa4 (patch) | |
| tree | 2a6eb0dd50a530dfb72496a69715438c9aa15a44 /weed/server | |
| parent | 2a7957b4ca83fdb5232d761074e81dce6b99648f (diff) | |
| download | seaweedfs-6850d28d6b99155dca2da8fa8bbf76124f528fa4.tar.xz seaweedfs-6850d28d6b99155dca2da8fa8bbf76124f528fa4.zip | |
refacotr: move signal handling and pprof to grace package
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server.go | 3 | ||||
| -rw-r--r-- | weed/server/webdav_server.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 596c91a58..956684d46 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -8,6 +8,7 @@ import ( "sync" "time" + "github.com/chrislusf/seaweedfs/weed/util/grace" "google.golang.org/grpc" "github.com/chrislusf/seaweedfs/weed/operation" @@ -111,7 +112,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.filer.LoadBuckets() - util.OnInterrupt(func() { + grace.OnInterrupt(func() { fs.filer.Shutdown() }) diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 445cc7b4d..11b89677f 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/chrislusf/seaweedfs/weed/util/grace" "golang.org/x/net/webdav" "google.golang.org/grpc" @@ -100,7 +101,7 @@ type WebDavFile struct { func NewWebDavFileSystem(option *WebDavOption) (webdav.FileSystem, error) { chunkCache := chunk_cache.NewChunkCache(256, option.CacheDir, option.CacheSizeMB) - util.OnInterrupt(func() { + grace.OnInterrupt(func() { chunkCache.Shutdown() }) return &WebDavFileSystem{ |