X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=a11e03f04d0a398efd1c1d24f9437ea0142def0a;hb=099686a6455463aa6ccba141da1481c82fdb0cec;hp=5c6e80a2fc172d81d676e77f1199c3d3cb90dcc0;hpb=443748e27be6e25fb36b1d32d4aee1a3da1b5539;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index 5c6e80a..a11e03f 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -82,6 +82,8 @@ var (
 	maxClients       = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients")
 	version          = flag.Bool("version", false, "Print version information")
 	warranty         = flag.Bool("warranty", false, "Print warranty information")
+
+	killed bool
 )
 
 func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
@@ -98,10 +100,8 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
 
 func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) bool {
 	if _, err := os.Stat(filepath.Join(*root, dir, InternalFlag)); err == nil {
-		log.Println(r.RemoteAddr, "pypi refresh skip, internal package", dir)
 		return true
 	}
-	log.Println(r.RemoteAddr, "pypi refresh", dir)
 	resp, err := http.Get(*pypiURL + dir + "/")
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadGateway)
@@ -139,6 +139,11 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
 			return false
 		}
 		if filename == filenameGet {
+			if killed {
+				// Skip heavy remote call, when shutting down
+				http.Error(w, "shutting down", http.StatusInternalServerError)
+				return false
+			}
 			log.Println(r.RemoteAddr, "pypi download", filename)
 			path = filepath.Join(*root, dir, filename)
 			resp, err = http.Get(uri)
@@ -198,27 +203,27 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
 }
 
 func listRoot(w http.ResponseWriter, r *http.Request) {
-	log.Println(r.RemoteAddr, "root")
 	files, err := ioutil.ReadDir(*root)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	w.Write([]byte(fmt.Sprintf(HTMLBegin, "root", "root")))
+	var result bytes.Buffer
+	result.WriteString(fmt.Sprintf(HTMLBegin, "root", "root"))
 	for _, file := range files {
 		if file.Mode().IsDir() {
-			w.Write([]byte(fmt.Sprintf(
+			result.WriteString(fmt.Sprintf(
 				HTMLElement,
 				*refreshURLPath+file.Name()+"/",
 				file.Name(),
-			)))
+			))
 		}
 	}
-	w.Write([]byte(HTMLEnd))
+	result.WriteString(HTMLEnd)
+	w.Write(result.Bytes())
 }
 
 func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh bool) {
-	log.Println(r.RemoteAddr, "dir", dir)
 	dirPath := filepath.Join(*root, dir)
 	if autorefresh {
 		if !refreshDir(w, r, dir, "") {
@@ -232,33 +237,40 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	w.Write([]byte(fmt.Sprintf(HTMLBegin, dir, dir)))
+	var result bytes.Buffer
+	result.WriteString(fmt.Sprintf(HTMLBegin, dir, dir))
 	var data []byte
 	var filenameClean string
 	for _, file := range files {
 		if !strings.HasSuffix(file.Name(), SHA256Ext) {
 			continue
 		}
+		if killed {
+			// Skip expensive I/O when shutting down
+			http.Error(w, "shutting down", http.StatusInternalServerError)
+			return
+		}
 		data, err = ioutil.ReadFile(filepath.Join(dirPath, file.Name()))
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		filenameClean = strings.TrimSuffix(file.Name(), SHA256Ext)
-		w.Write([]byte(fmt.Sprintf(
+		result.WriteString(fmt.Sprintf(
 			HTMLElement,
 			strings.Join([]string{
 				*refreshURLPath, dir, "/",
 				filenameClean, "#", SHA256Prefix, hex.EncodeToString(data),
 			}, ""),
 			filenameClean,
-		)))
+		))
 	}
-	w.Write([]byte(HTMLEnd))
+	result.WriteString(HTMLEnd)
+	w.Write(result.Bytes())
 }
 
 func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
-	log.Println(r.RemoteAddr, "pkg", filename)
+	log.Println(r.RemoteAddr, "get", filename)
 	path := filepath.Join(*root, dir, filename)
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		if !refreshDir(w, r, dir, filename) {
@@ -288,7 +300,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 	}
 	for _, file := range r.MultipartForm.File["content"] {
 		filename := file.Filename
-		log.Println(r.RemoteAddr, "upload", filename, "by", username)
+		log.Println(r.RemoteAddr, "put", filename, "by", username)
 		dir := filename[:strings.LastIndex(filename, "-")]
 		dirPath := filepath.Join(*root, dir)
 		path := filepath.Join(dirPath, filename)
@@ -347,7 +359,8 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 }
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "GET" {
+	switch r.Method {
+	case "GET":
 		var path string
 		var autorefresh bool
 		if strings.HasPrefix(r.URL.Path, *norefreshURLPath) {
@@ -371,8 +384,10 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		} else {
 			servePkg(w, r, parts[0], parts[1])
 		}
-	} else if r.Method == "POST" {
+	case "POST":
 		serveUpload(w, r)
+	default:
+		http.Error(w, "unknown action", http.StatusBadRequest)
 	}
 }
 
@@ -460,7 +475,7 @@ func main() {
 
 	needsRefreshPasswd := make(chan os.Signal, 0)
 	needsShutdown := make(chan os.Signal, 0)
-	killed := make(chan error, 0)
+	exitErr := make(chan error, 0)
 	signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
 	signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
 	go func() {
@@ -471,9 +486,10 @@ func main() {
 	}()
 	go func(s *http.Server) {
 		<-needsShutdown
+		killed = true
 		log.Println("Shutting down")
 		ctx, cancel := context.WithTimeout(context.TODO(), time.Minute)
-		killed <- s.Shutdown(ctx)
+		exitErr <- s.Shutdown(ctx)
 		cancel()
 	}(server)
 
@@ -485,7 +501,7 @@ func main() {
 	if err != http.ErrServerClosed {
 		log.Fatal(err)
 	}
-	if err := <-killed; err != nil {
+	if err := <-exitErr; err != nil {
 		log.Fatal(err)
 	}
 }