Correct some errors found by golint.

src/app/spreed-webrtc-server/config.go

@@ -96,7 +96,7 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
 		"contacts":      true,
 	}
 	modules := []string{}
-	for module, _ := range modulesTable {
+	for module := range modulesTable {
 		if container.GetBoolDefault("modules", module, true) {
 			modules = append(modules, module)
 		} else {

src/app/spreed-webrtc-server/main.go

@@ -196,15 +196,14 @@ func runner(runtime phoenix.Runtime) error {
 	sessionSecretString, err := runtime.GetString("app", "sessionSecret")
 	if err != nil {
 		return fmt.Errorf("No sessionSecret in config file.")
-	} else {
+	}
-		sessionSecret, err = hex.DecodeString(sessionSecretString)
+	sessionSecret, err = hex.DecodeString(sessionSecretString)
-		if err != nil {
+	if err != nil {
-			log.Println("Warning: sessionSecret value is not a hex encoded", err)
+		log.Println("Warning: sessionSecret value is not a hex encoded", err)
-			sessionSecret = []byte(sessionSecretString)
+		sessionSecret = []byte(sessionSecretString)
-		}
+	}
-		if len(sessionSecret) < 32 {
+	if len(sessionSecret) < 32 {
-			return fmt.Errorf("Length of sessionSecret must be at least 32 bytes.")
+		return fmt.Errorf("Length of sessionSecret must be at least 32 bytes.")
-		}
 	}
 
 	if len(sessionSecret) < 32 {
@@ -215,19 +214,18 @@ func runner(runtime phoenix.Runtime) error {
 	encryptionSecretString, err := runtime.GetString("app", "encryptionSecret")
 	if err != nil {
 		return fmt.Errorf("No encryptionSecret in config file.")
-	} else {
+	}
-		encryptionSecret, err = hex.DecodeString(encryptionSecretString)
+	encryptionSecret, err = hex.DecodeString(encryptionSecretString)
-		if err != nil {
+	if err != nil {
-			log.Println("Warning: encryptionSecret value is not a hex encoded", err)
+		log.Println("Warning: encryptionSecret value is not a hex encoded", err)
-			encryptionSecret = []byte(encryptionSecretString)
+		encryptionSecret = []byte(encryptionSecretString)
-		}
+	}
-		switch l := len(encryptionSecret); {
+	switch l := len(encryptionSecret); {
-		case l == 16:
+	case l == 16:
-		case l == 24:
+	case l == 24:
-		case l == 32:
+	case l == 32:
-		default:
+	default:
-			return fmt.Errorf("Length of encryptionSecret must be exactly 16, 24 or 32 bytes to select AES-128, AES-192 or AES-256.")
+		return fmt.Errorf("Length of encryptionSecret must be exactly 16, 24 or 32 bytes to select AES-128, AES-192 or AES-256.")
-		}
 	}
 
 	var turnSecret []byte

src/app/spreed-webrtc-server/room_manager.go

@@ -111,10 +111,9 @@ func (rooms *roomManager) UpdateRoom(session *Session, room *DataRoom) (*DataRoo
 	}
 	if roomWorker, ok := rooms.Get(session.Roomid); ok {
 		return room, roomWorker.Update(room)
-	} else {
-		// Set default room type if not found.
-		room.Type = rooms.roomTypeDefault
 	}
+	// Set default room type if room was not found.
+	room.Type = rooms.roomTypeDefault
 	// TODO(lcooper): We should almost certainly return an error in this case.
 	return room, nil
 }

src/app/spreed-webrtc-server/tokens.go

@@ -49,9 +49,8 @@ func (tokens Tokens) Post(request *http.Request) (int, interface{}, http.Header)
 	if valid != "" {
 		log.Printf("Good incoming token request: %s\n", auth)
 		return 200, &Token{Token: valid, Success: true}, http.Header{"Content-Type": {"application/json"}}
-	} else {
-		log.Printf("Wrong incoming token request: %s\n", auth)
-		return 403, NewApiError("invalid_token", "Invalid token"), http.Header{"Content-Type": {"application/json"}}
 	}
+	log.Printf("Wrong incoming token request: %s\n", auth)
+	return 403, NewApiError("invalid_token", "Invalid token"), http.Header{"Content-Type": {"application/json"}}
 
 }

src/app/spreed-webrtc-server/user.go

@@ -43,7 +43,8 @@ func NewUser(id string) *User {
 
 }
 
-// Return true if first session.
+// AddSession adds a session to the session table and returns true if
+// s is the first session.
 func (u *User) AddSession(s *Session) bool {
 	first := false
 	u.mutex.Lock()
@@ -56,7 +57,8 @@ func (u *User) AddSession(s *Session) bool {
 	return first
 }
 
-// Return true if no session left.
+// RemoveSession removes a session from the session table abd returns
+// true if no session is left left.
 func (u *User) RemoveSession(sessionID string) bool {
 	last := false
 	u.mutex.Lock()

src/app/spreed-webrtc-server/users.go

@@ -46,7 +46,7 @@ import (
 )
 
 var (
-	serialNumberLimit *big.Int = new(big.Int).Lsh(big.NewInt(1), 128)
+	serialNumberLimit = new(big.Int).Lsh(big.NewInt(1), 128)
 )
 
 type UsersHandler interface {
@@ -229,12 +229,12 @@ func (uh *UsersCertificateHandler) Create(un *UserNonce, request *http.Request)
 	}
 	spkacDerBytes, err := base64.StdEncoding.DecodeString(spkac)
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("spkac invalid: %s", err))
+		return nil, fmt.Errorf("spkac invalid: %s", err)
 	}
 
 	publicKey, err := pkac.ParseSPKAC(spkacDerBytes)
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("unable to parse spkac: %s", err))
+		return nil, fmt.Errorf("unable to parse spkac: %s", err)
 	}
 
 	template, err := uh.makeTemplate(un.Userid)
@@ -244,7 +244,7 @@ func (uh *UsersCertificateHandler) Create(un *UserNonce, request *http.Request)
 
 	certDerBytes, err := x509.CreateCertificate(rand.Reader, template, uh.certificate, publicKey, uh.privateKey)
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("failed to create certificate: %s", err))
+		return nil, fmt.Errorf("failed to create certificate: %s", err)
 	}
 
 	log.Println("Generated new certificate", un.Userid)
@@ -284,10 +284,9 @@ func (un *UserNonce) Response() (int, interface{}, http.Header) {
 	if un.contentType != "" {
 		header.Set("Content-Type", un.contentType)
 		return 200, un.raw, header
-	} else {
-		header.Set("Content-Type", "application/json")
-		return 200, un, header
 	}
+	header.Set("Content-Type", "application/json")
+	return 200, un, header
 }
 
 type Users struct {