Language mistakes and stylistic fixes

[govpn.git] / src / cypherpunks.ru / govpn / common.go

diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go
index 40674623fab86ed4790d3c2da54e36d227a1b0c9..b6c1d3fe9c3cdd3eeef21155100cf8670d9ddd37 100644 (file)
--- a/src/cypherpunks.ru/govpn/common.go
+++ b/src/cypherpunks.ru/govpn/common.go
@@ -91,7 +91,7 @@ func (p *Protocol) UnmarshalJSON(encoded []byte) error {
        if err := json.Unmarshal(encoded, &str); err != nil {
                return errors.Wrapf(
                        err,
-                       "Can't unmarshall to string %q",
+                       "Can not unmarshall to string %q",
                        hex.EncodeToString(encoded),
                )
        }
@@ -121,11 +121,9 @@ func (p *Protocol) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 // NewProtocolFromString converts a string into a govpn.Protocol
 func NewProtocolFromString(p string) (Protocol, error) {
-       var (
-               k Protocol
-               v string
-               lowP = strings.ToLower(p)
-       )
+       var k Protocol
+       var v string
+       lowP := strings.ToLower(p)
        for k, v = range protocolText {
                if strings.ToLower(v) == lowP {
                        return k, nil
@@ -168,7 +166,7 @@ func CatchSignalShutdown() chan interface{} {
                logger.WithFields(logrus.Fields{
                        "func":   logFuncPrefix + "CatchSignalShutdown",
                        "signal": sig.String(),
-               }).Debug("Catch signal, shutting down")
+               }).Debug("Catched signal, shutting down")
                shutdownChan <- sig
        }()
        return shutdownChan
@@ -183,6 +181,6 @@ func SetLogger(l *logrus.Logger) {
 // CloseLog log an error if a io.Closer fail to Close
 func CloseLog(c io.Closer, l *logrus.Logger, fields logrus.Fields) {
        if err := c.Close(); err != nil {
-               logrus.WithFields(fields).WithError(err).Error("Can't close connection")
+               logrus.WithFields(fields).WithError(err).Error("Can not close connection")
        }
 }