Changeset 29 in code

Timestamp:

Oct 19, 2021, 9:45:01 AM (4 years ago)

Author:

dev

Message:

Add logs and a verbose mode

File:

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

trunk/partage.go

@@ -6 +6 @@
         "io"
         "io/ioutil"
+        "log"
         "net/http"
         "os"
@@ -49 +50 @@
 }
 
+var verbose bool
+
 func writefile(f *os.File, s io.ReadCloser, contentlength int64) error {
         buffer := make([]byte, 4096)
@@ -94 +97 @@
         }
 
+        if verbose {
+                log.Printf("Saving metadata for %s in %s", meta.Filename, conf.metapath + "/" + meta.Filename + ".json")
+        }
+
         f, err := os.Create(conf.metapath + "/" + meta.Filename + ".json")
         if err != nil {
@@ -115 +122 @@
                 http.Error(w, "Internal error", http.StatusInternalServerError)
                 return
+        }
+
+        if verbose {
+                log.Printf("Serving template %s", t.Name())
         }
 
@@ -136 +147 @@
         }
         defer f.Close()
+
+        if verbose {
+                log.Printf("Writing %d bytes to %s", r.ContentLength, tmp)
+        }
 
         if err = writefile(f, r.Body, r.ContentLength); err != nil {
@@ -207 +222 @@
         }
 
+        if verbose {
+                log.Printf("Serving file %s", conf.rootdir + filename)
+        }
+
         http.ServeFile(w, r, conf.rootdir + filename)
 }
 
 func uploader(w http.ResponseWriter, r *http.Request) {
+        if verbose {
+                log.Printf("%s: <%s> %s %s %s", r.Host, r.RemoteAddr, r.Method, r.RequestURI, r.Proto)
+        }
+
         switch r.Method {
         case "POST":
@@ -238 +261 @@
         iniflags.Parse()
 
+        if verbose {
+                log.Printf("Applied configuration:\n%s", conf)
+        }
+
         if (conf.chroot != "") {
+                if verbose {
+                        log.Printf("Changing root to %s", conf.chroot)
+                }
                 syscall.Chroot(conf.chroot)
         }
@@ -261 +291 @@
                 }
 
+                if verbose {
+                        log.Printf("Dropping privileges to %s", conf.user)
+                }
+
                 syscall.Setuid(uid)
                 syscall.Setgid(gid)
@@ -267 +301 @@
         http.HandleFunc("/", uploader)
         http.Handle(conf.filectx, http.StripPrefix(conf.filectx, http.FileServer(http.Dir(conf.filepath))))
+
+        if verbose {
+                log.Printf("Listening on %s", conf.bind)
+        }
+
         http.ListenAndServe(conf.bind, nil)
 }