Browse Source

refactor(socket mount): Update socket mount pattern to `/tmp/seaweedf… (#3662)

pull/3664/head
Ryan Russell 2 years ago
committed by GitHub
parent
commit
19652c1b83
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      weed/command/filer.go
  2. 2
      weed/command/mount_std.go
  3. 2
      weed/shell/command_mount_configure.go

2
weed/command/filer.go

@ -295,7 +295,7 @@ func (fo *FilerOptions) startFiler() {
if runtime.GOOS != "windows" {
localSocket := *fo.localSocket
if localSocket == "" {
localSocket = fmt.Sprintf("/tmp/seaweefs-filer-%d.sock", *fo.port)
localSocket = fmt.Sprintf("/tmp/seaweedfs-filer-%d.sock", *fo.port)
}
if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) {
glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error())

2
weed/command/mount_std.go

@ -107,7 +107,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
if mountDirHash < 0 {
mountDirHash = -mountDirHash
}
*option.localSocket = fmt.Sprintf("/tmp/seaweefs-mount-%d.sock", mountDirHash)
*option.localSocket = fmt.Sprintf("/tmp/seaweedfs-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())

2
weed/shell/command_mount_configure.go

@ -47,7 +47,7 @@ func (c *commandMountConfigure) Do(args []string, commandEnv *CommandEnv, writer
if mountDirHash < 0 {
mountDirHash = -mountDirHash
}
localSocket := fmt.Sprintf("/tmp/seaweefs-mount-%d.sock", mountDirHash)
localSocket := fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", mountDirHash)
clientConn, err := grpc.Dial("passthrough:///unix://"+localSocket, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {

Loading…
Cancel
Save