Changeset 61 in code for trunk

Timestamp:

Nov 10, 2021, 10:38:55 AM (4 years ago)

Author:

contact

Message:

Add support for "expiry" form setting

File:

• trunk/partage.go (modified) (3 diffs)

trunk/partage.go

@@ -93 +93 @@
         f.Close()
 
+        if expiry < 0 {
+                expiry = conf.expiry
+        }
+
         meta := metadata{
                 Filename: filepath.Base(filename),
@@ -197 +201 @@
                 }
 
-                writemeta(tmp.Name(), conf.expiry)
+                expiry, err := strconv.Atoi(r.PostFormValue("expiry"))
+                if err != nil || expiry < 0 {
+                        expiry = int(conf.expiry)
+                }
+                writemeta(tmp.Name(), int64(expiry))
 
                 link := conf.baseuri + conf.filectx + filepath.Base(tmp.Name())
@@ -328 +336 @@
 
         if conf.listen[0] == '/' {
-                /* Remove any stale socket */
-                os.Remove(conf.listen)
-                if listener, err = net.Listen("unix", conf.listen); err != nil {
+                listener, err = net.Listen("unix", conf.listen)
+                if err != nil {
                         log.Fatal(err)
                 }
-                defer listener.Close()
-
-                /*
-                 * Ensure unix socket is removed on exit.
-                 * Note: this might not work when dropping privileges…
-                 */
+
+                /* Ensure unix socket is removed on exit */
                 defer os.Remove(conf.listen)
                 sigs := make(chan os.Signal, 1)
-                signal.Notify(sigs, os.Interrupt, os.Kill, syscall.SIGTERM)
+                signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
                 go func() {
                         _ = <-sigs
-                        listener.Close()
-                        if err = os.Remove(conf.listen); err != nil {
-                                log.Fatal(err)
-                        }
+                        os.Remove(conf.listen)
                         os.Exit(0)
                 }()
         } else {
-                if listener, err = net.Listen("tcp", conf.listen); err != nil {
+                listener, err = net.Listen("tcp", conf.listen)
+                if err != nil {
                         log.Fatal(err)
                 }
-                defer listener.Close()
         }