Go language does not like underscores in names

[govpn.git] / src / cypherpunks.ru / govpn / cmd / govpn-client / main.go

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index bd8b0678b1eca147079db371fac697e5d34c9ef6..b17063297ca8e51b2900d0a56a10926f03843e5b 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -53,7 +53,7 @@ func main() {
                syslog      = flag.Bool("syslog", false, "Enable logging to syslog")
                version     = flag.Bool("version", false, "Print version information")
                warranty    = flag.Bool("warranty", false, "Print warranty information")
-               logLevel    = flag.String("log_level", "warning", "Log level")
+               logLevel    = flag.String("loglevel", "warning", "Logging level")
                protocol    govpn.Protocol
                err         error
                fields      = logrus.Fields{"func": "main"}
@@ -71,7 +71,7 @@ func main() {
 
        logger, err := govpn.NewLogger(*logLevel, *syslog)
        if err != nil {
-               logrus.WithFields(fields).WithError(err).Fatal("Can't initialize logging")
+               logrus.WithFields(fields).WithError(err).Fatal("Can not initialize logging")
        }
 
        if *egdPath != "" {
@@ -80,7 +80,13 @@ func main() {
        }
 
        if protocol, err = govpn.NewProtocolFromString(*proto); err != nil {
-               logger.WithError(err).WithFields(fields).WithField("proto", *proto).Fatal("Invalid protocol")
+               logger.WithError(
+                       err,
+               ).WithFields(
+                       fields,
+               ).WithField(
+                       "proto", *proto,
+               ).Fatal("Invalid protocol")
        }
 
        if *proxyAddr != "" && protocol == govpn.ProtocolUDP {
@@ -103,7 +109,7 @@ func main() {
        }
        priv, err := verifier.PasswordApply(key)
        if err != nil {
-               logger.WithError(err).Fatal("Can't PasswordApply")
+               logger.WithError(err).Fatal("Can not PasswordApply")
        }
        if *encless {
                if protocol != govpn.ProtocolTCP {
@@ -139,7 +145,7 @@ func main() {
 
        c, err := client.NewClient(conf, logger, govpn.CatchSignalShutdown())
        if err != nil {
-               logger.WithError(err).Fatal("Can't initialize client")
+               logger.WithError(err).Fatal("Can not initialize client")
        }
 
        if *stats != "" {