Merge pull request #62 from coreos/master

Remove the lock in init()
2013-07-08 16:58:42 -07:00 · 2013-07-08 16:58:42 -07:00 · 1c4b918fab
parent 1157ef0199 3392f8192f
commit 1c4b918fab
1 changed files with 0 additions and 2 deletions
--- a/server.go
+++ b/server.go
@ -296,8 +296,6 @@ func (s *Server) SetHeartbeatTimeout(duration time.Duration) {

 // Starts the server with a log at the given path.
 func (s *Server) Initialize() error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()

 	// Exit if the server is already running.
 	if s.state != Stopped {