From 0f80de86b224dc625c0cec372dee8b2cf238d3a5 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Thu, 20 Feb 2020 15:53:26 +0100 Subject: [PATCH] simplify some code now gocyclo is happy again --- service/service.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/service/service.go b/service/service.go index 9cf9fdf3..7008eadd 100644 --- a/service/service.go +++ b/service/service.go @@ -216,6 +216,14 @@ func (s *Service) StartPortableMode(sftpdPort int, enabledSSHCommands []string, } s.Stop() }() + + logger.InfoToConsole("Portable mode ready, SFTP port: %v, user: %#v, password: %#v, public keys: %v, directory: %#v, "+ + "permissions: %v, enabled ssh commands: %v", sftpdConf.BindPort, s.PortableUser.Username, s.PortableUser.Password, + s.PortableUser.PublicKeys, s.getPortableDirToServe(), s.PortableUser.Permissions, sftpdConf.EnabledSSHCommands) + return nil +} + +func (s *Service) getPortableDirToServe() string { var dirToServe string if s.PortableUser.FsConfig.Provider == 1 { dirToServe = s.PortableUser.FsConfig.S3Config.KeyPrefix @@ -224,8 +232,5 @@ func (s *Service) StartPortableMode(sftpdPort int, enabledSSHCommands []string, } else { dirToServe = s.PortableUser.HomeDir } - logger.InfoToConsole("Portable mode ready, SFTP port: %v, user: %#v, password: %#v, public keys: %v, directory: %#v, "+ - "permissions: %v, enabled ssh commands: %v", sftpdConf.BindPort, s.PortableUser.Username, s.PortableUser.Password, - s.PortableUser.PublicKeys, dirToServe, s.PortableUser.Permissions, sftpdConf.EnabledSSHCommands) - return nil + return dirToServe }