X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=08f9d8eb0d7ae878411d5688c210184285491711;hb=b144ad5b2dd5d62dd14909afd6696b3137bdf0db;hp=fa2fb59040de0021f714ccc28b2468f4ffb57c7b;hpb=3b66475124ea28bd0cb95363028861b598b71883;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index fa2fb59..08f9d8e 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -31,10 +31,12 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"regexp"
 	"runtime"
 	"strings"
+	"syscall"
 )
 
 const (
@@ -65,6 +67,7 @@ var (
 	refreshURLPath   = flag.String("refresh", "/simple/", "Auto-refreshing URL path")
 	pypiURL          = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
 	passwdPath       = flag.String("passwd", "passwd", "Path to file with authenticators")
+	passwdCheck      = flag.Bool("passwd-check", false, "Test the -passwd file for syntax errors and exit")
 	fsck             = flag.Bool("fsck", false, "Check integrity of all packages")
 	version          = flag.Bool("version", false, "Print version information")
 	warranty         = flag.Bool("warranty", false, "Print warranty information")
@@ -455,23 +458,20 @@ func main() {
 		}
 		return
 	}
-	passwd, err := ioutil.ReadFile(*passwdPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for _, credentials := range strings.Split(strings.TrimRight(string(passwd), "\n"), "\n") {
-		splitted := strings.Split(credentials, ":")
-		if len(splitted) != 2 {
-			log.Fatal("Wrong login:password format")
-		}
-		_, auther, err := strToAuther(splitted[1])
-		if err != nil {
-			log.Fatal(err)
-		}
-		passwords[splitted[0]] = auther
-		log.Println("Added password for " + splitted[0])
+	if *passwdCheck {
+		refreshPasswd()
+		return
 	}
+	refreshPasswd()
 	log.Println("root:", *root, "bind:", *bind)
+	needsRefreshPasswd := make(chan os.Signal, 0)
+	signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
+	go func() {
+		for range needsRefreshPasswd {
+			log.Println("Refreshing passwords")
+			refreshPasswd()
+		}
+	}()
 	http.HandleFunc(*norefreshURLPath, handler)
 	http.HandleFunc(*refreshURLPath, handler)
 	log.Fatal(http.ListenAndServe(*bind, nil))