aboutsummaryrefslogtreecommitdiff
path: root/weed/command
diff options
context:
space:
mode:
authorKonstantin Lebedev <9497591+kmlebedev@users.noreply.github.com>2022-04-07 18:50:27 +0500
committerKonstantin Lebedev <9497591+kmlebedev@users.noreply.github.com>2022-04-07 18:50:27 +0500
commitf5246b748d30ce1d0687dee2089848c96492ffff (patch)
tree5ebbde9317f9b3bff0b32d8976a09cdc61705786 /weed/command
parent7ff248d5cda0dbcad722e2f7886bf3ca13874069 (diff)
parentabe3cc6df228a2700f25557f7d600f6810b450bf (diff)
downloadseaweedfs-f5246b748d30ce1d0687dee2089848c96492ffff.tar.xz
seaweedfs-f5246b748d30ce1d0687dee2089848c96492ffff.zip
Merge branch 'new_master' into hashicorp_raft
# Conflicts: # weed/pb/master_pb/master.pb.go
Diffstat (limited to 'weed/command')
-rw-r--r--weed/command/mount_std.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go
index 7926c9cdc..1d929dc96 100644
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -108,9 +108,9 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
mountDirHash = -mountDirHash
}
*option.localSocket = fmt.Sprintf("/tmp/seaweefs-mount-%d.sock", mountDirHash)
- if err := os.Remove(*option.localSocket); err != nil && !os.IsNotExist(err) {
- glog.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error())
- }
+ }
+ if err := os.Remove(*option.localSocket); err != nil && !os.IsNotExist(err) {
+ glog.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error())
}
montSocketListener, err := net.Listen("unix", *option.localSocket)
if err != nil {