Changeset 48 in code for trunk/partage.go

Timestamp:

Oct 20, 2021, 7:44:48 PM (4 years ago)

Author:

dev

Message:

Rename "bind" parameter to "listen"

File:

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

trunk/partage.go

@@ -41 +41 @@
         group    string
         chroot   string
-        bind     string
+        listen     string
         baseuri  string
         rootdir  string
@@ -255 +255 @@
         }
 
-        conf.bind = cfg.Section("").Key("bind").String()
+        conf.listen = cfg.Section("").Key("listen").String()
         conf.user = cfg.Section("").Key("user").String()
         conf.group = cfg.Section("").Key("group").String()
@@ -298 +298 @@
 
         /* default values */
-        conf.bind = "0.0.0.0:8080"
+        conf.listen = "0.0.0.0:8080"
         conf.baseuri = "http://127.0.0.1:8080"
         conf.rootdir = "static"
@@ -327 +327 @@
         }
 
-        if conf.bind[0] == '/' {
-                listener, err = net.Listen("unix", conf.bind)
+        if conf.listen[0] == '/' {
+                listener, err = net.Listen("unix", conf.listen)
                 if err != nil {
                         log.Fatal(err)
@@ -334 +334 @@
 
                 /* Ensure unix socket is removed on exit */
-                defer os.Remove(conf.bind)
+                defer os.Remove(conf.listen)
                 sigs := make(chan os.Signal, 1)
                 signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
                 go func() {
                         _ = <-sigs
-                        os.Remove(conf.bind)
+                        os.Remove(conf.listen)
                         os.Exit(0)
                 }()
         } else {
-                listener, err = net.Listen("tcp", conf.bind)
+                listener, err = net.Listen("tcp", conf.listen)
                 if err != nil {
                         log.Fatal(err)
@@ -359 +359 @@
 
                 if listener.Addr().Network() == "unix" {
-                        os.Chown(conf.bind, uid, gid)
+                        os.Chown(conf.listen, uid, gid)
                 }
 
@@ -370 +370 @@
 
         if verbose {
-                log.Printf("Listening on %s", conf.bind)
+                log.Printf("Listening on %s", conf.listen)
         }