Changeset 378 in code

Timestamp:

Aug 10, 2020, 1:03:38 PM (5 years ago)

Author:

contact

Message:

Remove user from Server map when stopped

File:

• trunk/server.go (modified) (3 diffs)

trunk/server.go

@@ -80 +80 @@
 
         s.lock.Lock()
-        for _, record := range users {
-                s.Logger.Printf("starting bouncer for user %q", record.Username)
-                u := newUser(s, &record)
-                s.users[u.Username] = u
-
-                go u.run()
+        for i := range users {
+                s.addUserLocked(&users[i])
         }
         s.lock.Unlock()
@@ -105 +101 @@
         }
 
-        s.Logger.Printf("starting bouncer for new user %q", user.Username)
-        u := newUser(s, user)
-        s.users[u.Username] = u
-        go u.run()
-        return u, nil
+        return s.addUserLocked(user), nil
 }
 
@@ -116 +108 @@
         u := s.users[name]
         s.lock.Unlock()
+        return u
+}
+
+func (s *Server) addUserLocked(user *User) *user {
+        s.Logger.Printf("starting bouncer for user %q", user.Username)
+        u := newUser(s, user)
+        s.users[u.Username] = u
+
+        go func() {
+                u.run()
+
+                s.lock.Lock()
+                delete(s.users, u.Username)
+                s.lock.Unlock()
+        }()
+
         return u
 }