Soji: Fix concurrent map writes panic.

sarifsystems · Nov 13, 2016 · 2d160a8 · 2d160a8
1 parent 11be7f9
commit 2d160a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/util/soji/main.go b/cmd/util/soji/main.go
@@ -132,6 +132,7 @@ func relay() {
 	c, err := app.ClientDial(sarif.ClientInfo{
 		Name: "soji/" + sarif.GenerateId(),
 	})
+	c.HandleConcurrent = false
 	app.Must(err)
 
 	c.Subscribe("status", "", func(msg sarif.Message) {

diff --git a/core/server/server.go b/core/server/server.go
@@ -198,7 +198,7 @@ func (s *Server) InitModules() error {
 
 func (s *Server) findConfigStore() error {
 	time.Sleep(100 * time.Millisecond)
-	for try := 1; try <= 3; try++ {
+	for try := 1; try <= 5; try++ {
 		req := s.Client.Request(sarif.Message{
 			Action:      "proto/discover/store/get/config",
 			Destination: s.ServerConfig.ConfigStore,
@@ -211,7 +211,7 @@ func (s *Server) findConfigStore() error {
 			}
 			s.configStoreInitialized = true
 			return nil
-		case <-time.After(500 * time.Duration(try) * time.Millisecond):
+		case <-time.After(1 * time.Duration(try) * time.Second):
 		}
 	}