Language mistakes and stylistic fixes

[govpn.git] / src / cypherpunks.ru / govpn / client / tcp.go

diff --git a/src/cypherpunks.ru/govpn/client/tcp.go b/src/cypherpunks.ru/govpn/client/tcp.go
index eca48521bc446eb84f846634dd5c4542ddcaf831..0b7bbe6cf763c86f439da7ac5fb891686c3255a4 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/tcp.go
+++ b/src/cypherpunks.ru/govpn/client/tcp.go
@@ -37,7 +37,7 @@ func (c *Client) startTCP() {
        l := c.logger.WithField("func", logFuncPrefix+"Client.startTCP")
        // initialize using a file descriptor
        if c.config.FileDescriptor > 0 {
-               l.WithField("fd", c.config.FileDescriptor).Debug("Connect using file descriptor")
+               l.WithField("fd", c.config.FileDescriptor).Debug("Connecting using file descriptor")
                var err error
                conn, err = net.FileConn(os.NewFile(
                        uintptr(c.config.FileDescriptor),
@@ -49,7 +49,7 @@ func (c *Client) startTCP() {
                }
        } else {
                // TODO move resolution into the loop, as the name might change over time
-               l.WithField("fd", c.config.RemoteAddress).Debug("Connect using TCP")
+               l.WithField("fd", c.config.RemoteAddress).Debug("Connecting using TCP")
                remote, err := net.ResolveTCPAddr("tcp", c.config.RemoteAddress)
                if err != nil {
                        c.Error <- errors.Wrapf(err, "net.ResolveTCPAdd %s", c.config.RemoteAddress)
@@ -103,7 +103,9 @@ HandshakeCycle:
                }
                n, err = conn.Read(buf[prev:])
                if err != nil {
-                       c.logger.WithFields(fields).WithFields(
+                       c.logger.WithFields(
+                               fields,
+                       ).WithFields(
                                c.LogFields(),
                        ).Debug("Packet timeouted")
                        c.timeouted <- struct{}{}
@@ -113,17 +115,23 @@ HandshakeCycle:
                prev += n
                _, err = c.idsCache.Find(buf[:prev])
                if err != nil {
-                       c.logger.WithFields(fields).WithFields(
+                       c.logger.WithFields(
+                               fields,
+                       ).WithFields(
                                c.LogFields(),
-                       ).WithError(err).Debug("Can't find peer in ids")
+                       ).WithError(err).Debug("Can not find peer in ids")
                        continue
                }
                peer, err = hs.Client(buf[:prev])
                prev = 0
                if err != nil {
-                       c.logger.WithFields(fields).WithError(err).WithFields(
+                       c.logger.WithFields(
+                               fields,
+                       ).WithError(
+                               err,
+                       ).WithFields(
                                c.LogFields(),
-                       ).Debug("Can't create new peer")
+                       ).Debug("Can not create new peer")
                        continue
                }
                c.logger.WithFields(fields).WithFields(c.LogFields()).Info("Handshake completed")
@@ -167,7 +175,11 @@ TransportCycle:
                }
                n, err = conn.Read(buf[prev:])
                if err != nil {
-                       c.logger.WithError(err).WithFields(c.LogFields()).Debug("Connection timeouted")
+                       c.logger.WithError(
+                               err,
+                       ).WithFields(
+                               c.LogFields(),
+                       ).Debug("Connection timeouted")
                        c.timeouted <- struct{}{}
                        break TransportCycle
                }