From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 14 Feb 2017 09:17:49 +0000 (+0300)
Subject: Simplify operations with arrays and maps
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=6cad14397416d1be2bd11281d46432d7daf64335

Simplify operations with arrays and maps
---

diff --git a/src/cypherpunks.ru/govpn/logger.go b/src/cypherpunks.ru/govpn/logger.go
index 07b8c1a..cd7eabb 100644
--- a/src/cypherpunks.ru/govpn/logger.go
+++ b/src/cypherpunks.ru/govpn/logger.go
@@ -39,22 +39,16 @@ type syslogFormatter struct{}
 
 // Format converts a log entry into a list of bytes
 func (sf *syslogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	buf := bytes.NewBuffer(nil)
-	var (
-		err   error
-		index int
-	)
-	keys := make([]string, len(entry.Data))
+	var buf bytes.Buffer
+	var err error
+	keys := make([]string, 0, len(entry.Data))
 	for k := range entry.Data {
-		keys[index] = k
-		index++
+		keys = append(keys, k)
 	}
 	sort.Strings(keys)
 
-	for index = range keys {
-		k := keys[index]
-		v := entry.Data[k]
-		if _, err = buf.WriteString(fmt.Sprintf("[%s]%+v ", k, v)); err != nil {
+	for _, k := range keys {
+		if _, err = buf.WriteString(fmt.Sprintf("[%s]%+v ", k, entry.Data[k])); err != nil {
 			return nil, errors.Wrapf(err, "buf.WriteString %s", k)
 		}
 	}