Changeset 62 in code for trunk

Timestamp:

Jan 18, 2022, 6:46:54 AM (3 years ago)

Author:

dev

Message:

Merge branch 'master' of git.z3bra.org:partage

File:

• trunk/partage.go (modified) (1 diff)

trunk/partage.go

@@ -336 +336 @@
 
         if conf.listen[0] == '/' {
-                listener, err = net.Listen("unix", conf.listen)
-                if err != nil {
+                /* Remove any stale socket */
+                os.Remove(conf.listen)
+                if listener, err = net.Listen("unix", conf.listen); err != nil {
                         log.Fatal(err)
                 }
-
-                /* Ensure unix socket is removed on exit */
+                defer listener.Close()
+
+                /*
+                 * Ensure unix socket is removed on exit.
+                 * Note: this might not work when dropping privileges…
+                 */
                 defer os.Remove(conf.listen)
                 sigs := make(chan os.Signal, 1)
-                signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+                signal.Notify(sigs, os.Interrupt, os.Kill, syscall.SIGTERM)
                 go func() {
                         _ = <-sigs
-                        os.Remove(conf.listen)
+                        listener.Close()
+                        if err = os.Remove(conf.listen); err != nil {
+                                log.Fatal(err)
+                        }
                         os.Exit(0)
                 }()
         } else {
-                listener, err = net.Listen("tcp", conf.listen)
-                if err != nil {
+                if listener, err = net.Listen("tcp", conf.listen); err != nil {
                         log.Fatal(err)
                 }
+                defer listener.Close()
         }