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),
)
}
// NewProtocolFromString converts a string into a govpn.Protocol
func NewProtocolFromString(p string) (Protocol, error) {
+ var k Protocol
+ var v string
lowP := strings.ToLower(p)
- for k, v := range protocolText {
+ for k, v = range protocolText {
if strings.ToLower(v) == lowP {
return k, nil
}
choices := make([]string, len(protocolText))
var index = 0
- for k, v := range protocolText {
- if v == p {
- z := k
- p = &z
- return nil
- }
- choices[index] = v
+ for k = range protocolText {
+ choices[index] = protocolText[k]
index++
}
- return Protocol(-1), errors.Errorf("Invalid protocol %q: %s", p, strings.Join(choices, ","))
+ return Protocol(-1), errors.Errorf(
+ "Invalid protocol %q: %s", p, strings.Join(choices, ","),
+ )
}
// SliceZero zeros each byte.
logger.WithFields(logrus.Fields{
"func": logFuncPrefix + "CatchSignalShutdown",
"signal": sig.String(),
- }).Debug("Catch signal, shutting down")
+ }).Debug("Catched signal, shutting down")
shutdownChan <- sig
}()
return shutdownChan
// 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")
}
}