X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;fp=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;h=a60e5a01cd38251818b0ec2b6d455c78a06b8402;hb=c4ce2306df402e03b7fd0f2f10e07cf21b2babc2;hp=2c7026754334411fd45ffeca70c468d5556b309b;hpb=012173bd090f87e8dffbc124f41425eef8a9a7f8;p=govpn.git diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go index 2c70267..a60e5a0 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go @@ -58,12 +58,18 @@ func main() { logger, err = govpn.NewLogger(*logLevel, *syslog) if err != nil { - logrus.WithFields(fields).WithError(err).Fatal("Couldn't initialize logging") + logrus.WithFields( + fields, + ).WithError(err).Fatal("Couldn't initialize logging") } govpn.SetLogger(logger) if *egdPath != "" { - logger.WithField("egd_path", *egdPath).WithFields(fields).Debug("Init EGD") + logger.WithField( + "egd_path", *egdPath, + ).WithFields( + fields, + ).Debug("Init EGD") govpn.EGDInit(*egdPath) } @@ -75,13 +81,23 @@ func main() { Timeout: govpn.TimeoutDefault, } if serverConfig.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 err = serverConfig.Validate(); err != nil { logger.WithError(err).WithFields(fields).Fatal("Invalid configuration") } - srv := server.NewServer(serverConfig, confs, idsCache, logger, govpn.CatchSignalShutdown()) + srv := server.NewServer( + serverConfig, + confs, + idsCache, + logger, + govpn.CatchSignalShutdown(), + ) if *stats != "" { go govpn.StatsProcessor(*stats, srv.KnownPeers())