yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Other: added a few log entries related to gRPC server and client config files.

Browse Source
This commit is contained in:
Xavier Michelon
2022-10-13 08:49:00 +02:00
parent ee515394c0
commit d1a7ca7822
5 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/frontend/grpc/service.go
View File

@ -124,7 +124,7 @@ func NewService(
func (s *Service) startGRPCServer() {
tlsConfig, pemCert, err := s.generateTLSConfig()
if err != nil {
s.log.WithError(err).Panic("could not generate gRPC TLS config")
s.log.WithError(err).Panic("Could not generate gRPC TLS config")
}
s.pemCert = string(pemCert)
@ -135,11 +135,13 @@ func (s *Service) startGRPCServer() {
s.listener, err = net.Listen("tcp", "127.0.0.1:0") // Port 0 means that the port is randomly picked by the system.
if err != nil {
s.log.WithError(err).Panic("could not create gRPC listener")
s.log.WithError(err).Panic("Could not create gRPC listener")
}
if err := s.saveGRPCServerConfigFile(); err != nil {
s.log.WithError(err).Panic("could not write gRPC service configuration file")
if path, err := s.saveGRPCServerConfigFile(); err != nil {
s.log.WithError(err).WithField("path", path).Panic("Could not write gRPC service config file")
} else {
s.log.WithField("path", path).Debug("Successfully saved gRPC service config file")
}
s.log.Info("gRPC server listening at ", s.listener.Addr())
@ -435,10 +437,10 @@ func (s *Service) generateTLSConfig() (tlsConfig *cryptotls.Config, pemCert []by
return tlsConfig, pemCert, nil
}
func (s *Service) saveGRPCServerConfigFile() error {
func (s *Service) saveGRPCServerConfigFile() (string, error) {
address, ok := s.listener.Addr().(*net.TCPAddr)
if !ok {
return fmt.Errorf("could not retrieve gRPC service listener address")
return "", fmt.Errorf("could not retrieve gRPC service listener address")
}
sc := config{
@ -449,8 +451,10 @@ func (s *Service) saveGRPCServerConfigFile() error {
settingsPath, err := s.locations.ProvideSettingsPath()
if err != nil {
return err
return "", err
}
return sc.save(filepath.Join(settingsPath, serverConfigFileName))
configPath := filepath.Join(settingsPath, serverConfigFileName)
return configPath, sc.save(configPath)
}

10
internal/frontend/grpc/service_methods.go
View File

@ -47,12 +47,18 @@ func (s *Service) CheckTokens(ctx context.Context, clientConfigPath *wrapperspb.
return nil, err
}
path := clientConfigPath.Value
logEntry := s.log.WithField("path", path)
var clientConfig config
if err := clientConfig.load(clientConfigPath.Value); err != nil {
s.log.WithError(err).Error("could not read gRPC client config file")
if err := clientConfig.load(path); err != nil {
logEntry.WithError(err).Error("Could not read gRPC client config file")
return nil, err
}
logEntry.Info("gRPC client config file was successfully loaded")
return &wrapperspb.StringValue{Value: clientConfig.Token}, nil
}