Fix workability to password refreshing

diff --git a/gocheese.go b/gocheese.go
index fa3b4302f3770b1836be22a26d423ff6144a5d53..08f9d8eb0d7ae878411d5688c210184285491711 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -468,6 +468,7 @@ func main() {
        signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
        go func() {
                for range needsRefreshPasswd {
+                       log.Println("Refreshing passwords")
                        refreshPasswd()
                }
        }()

diff --git a/passwd.go b/passwd.go
index 29419564ce9c22b3fb4ceab0f0d0cb7e8658edee..b13a342c92835a25dfc67f968dc956dfb54ae3d1 100644 (file)
--- a/passwd.go
+++ b/passwd.go
@@ -29,20 +29,22 @@ func refreshPasswd() {
        if err != nil {
                log.Fatal(err)
        }
+       passwordsNew := make(map[string]Auther)
        for i, credentials := range strings.Split(strings.TrimRight(string(passwd), "\n"), "\n") {
                splitted := strings.Split(credentials, ":")
                if len(splitted) != 2 {
                        log.Fatalf("%s:%d: Wrong login:password format", *passwdPath, i)
                }
                login := splitted[0]
-               if _, exists := passwords[login]; exists {
+               if _, exists := passwordsNew[login]; exists {
                        log.Fatalf("%s:%d: %s: already exists", *passwdPath, i, login)
                }
                _, auther, err := strToAuther(splitted[1])
                if err != nil {
                        log.Fatalf("%s:%d: %s: %s", *passwdPath, i, login, err)
                }
-               passwords[login] = auther
+               passwordsNew[login] = auther
                log.Println("Added password for " + login)
        }
+       passwords = passwordsNew
 }