Skip to content

Commit

Permalink
fix: added more logger
Browse files Browse the repository at this point in the history
  • Loading branch information
@mahendraintelops
mahendraintelops committed Dec 2, 2023
1 parent 6e78f94 commit b364253
Show file tree
Hide file tree
Showing 22 changed files with 88 additions and 39 deletions.
2 changes: 1 addition & 1 deletion cmd/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ This command will start thr gRPC server and allow the gRPC clients to get connec
defer func() {
if grpcTraceProvider != nil {
if err := grpcTraceProvider.Shutdown(context.Background()); err != nil {
log.Printf("Error shutting down tracer provider: %v", err)
log.Errorf("Error shutting down tracer provider: %v", err)
}
}
}()
Expand Down
2 changes: 2 additions & 0 deletions grpc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func sendFile(projectName string, server project.ProjectService_GenerateCodeServ
return status.Error(codes.NotFound, "file is not found")
}
if err := server.SendHeader(f.Metadata()); err != nil {
log.Errorf("err : %s", err)
return status.Error(codes.Internal, "error during sending header")
}
fileChunk := &project.GenerateCodeResponse{FileChunk: make([]byte, chunkSize)}
Expand All @@ -105,6 +106,7 @@ Loop:
fileChunk.FileChunk = fileChunk.FileChunk[:n]
serverErr := server.Send(fileChunk)
if serverErr != nil {
log.Errorf("err : %s", serverErr)
return status.Errorf(codes.Internal, "server.Send: %v", serverErr)
}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/languages/dotnet/frameworks/dotnet-clean-architecture-framework/copier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func NewCopier(gitPlatformURL, gitPlatformUserName, gitRepositoryName, nodeName,
func (c *Copier) createRestServerDirectories() error {
rootDirectory := c.NodeDirectoryName
if err := utils.CreateDirectories(rootDirectory); err != nil {
log.Debugf("error creating root directory: %v", err)
log.Errorf("error creating root directory: %v", err)
return err
}
return nil
Expand All @@ -55,7 +55,7 @@ func (c *Copier) createRestServerDirectories() error {
// CreateRestConfigs creates/copies relevant files to generated project
func (c *Copier) CreateRestConfigs() error {
if err := c.CreateRestServer(); err != nil {
log.Debugf("error creating rest server: %v", err)
log.Errorf("error creating rest server: %v", err)
return err
}
return nil
Expand All @@ -67,7 +67,7 @@ func (c *Copier) CreateRestServer() error {
if c.IsRestServer {
// create directories for controller, service, dao, models
if err := c.createRestServerDirectories(); err != nil {
log.Debugf("error creating rest server directories: %v", err)
log.Errorf("error creating rest server directories: %v", err)
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/languages/dotnet/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ func generateRESTConfig(_ context.Context, dotNetValues *DotNetValues) error {
}
if n.RestConfig.Server != nil {
if err := dotNetCleanArchitectureCopier.CreateRestServer(); err != nil {
log.Debugf("err : %s", err)
log.Errorf("err : %s", err)
return err
}
}
// copy all files at root level, fire this at last
if err := dotNetCleanArchitectureCopier.CreateRootLevelFiles(); err != nil {
log.Debugf("err : %s", err)
log.Errorf("err : %s", err)
return err
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions internal/languages/dotnet/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ func Process(ctx context.Context) error {

// fills default config for DotNet
if err := dotNetValues.LDotNetLangNode.FillDefaults(); err != nil {
log.Debugf("err : %s", err)
log.Errorf("err : %s", err)
return err
}

// generate DotNet project
if err := Generate(ctx); err != nil {
log.Debugf("err : %s", err)
log.Errorf("err : %s", err)
return err
}

Expand Down
10 changes: 10 additions & 0 deletions internal/languages/executor/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package executor

import (
"github.com/intelops/compage/internal/utils"
log "github.com/sirupsen/logrus"
"os"
"strings"
"text/template"
Expand All @@ -18,9 +19,11 @@ func ExecuteWithFuncs(filePaths []*string, data map[string]interface{}, funcMap
fileName := (*filePathName)[strings.LastIndex(*filePathName, utils.SubstrString)+1:]
createdFile, err := os.Create(strings.TrimSuffix(*filePathName, utils.TemplateExtension))
if err != nil {
log.Errorf("error while creating the file [" + err.Error() + "]" + *filePathName)
return err
}
if err0 := parsedTemplates.ExecuteTemplate(createdFile, fileName, data); err0 != nil {
log.Errorf("error while executing the template [" + err0.Error() + "]" + *filePathName)
return err0
}
}
Expand All @@ -29,6 +32,7 @@ func ExecuteWithFuncs(filePaths []*string, data map[string]interface{}, funcMap
for _, filePathName := range filePaths {
if strings.HasSuffix(*filePathName, ".tmpl") {
if err := os.Remove(*filePathName); err != nil {
log.Errorf("error while removing the template file [" + err.Error() + "]" + *filePathName)
return err
}
}
Expand All @@ -44,9 +48,11 @@ func Execute(filePaths []*string, data map[string]interface{}) error {
fileName := (*filePathName)[strings.LastIndex(*filePathName, utils.SubstrString)+1:]
createdFile, err := os.Create(strings.TrimSuffix(*filePathName, utils.TemplateExtension))
if err != nil {
log.Errorf("error while creating the file [" + err.Error() + "]" + *filePathName)
return err
}
if err0 := parsedTemplates.ExecuteTemplate(createdFile, fileName, data); err0 != nil {
log.Errorf("error while executing the template [" + err0.Error() + "]" + *filePathName)
return err0
}
}
Expand All @@ -55,6 +61,7 @@ func Execute(filePaths []*string, data map[string]interface{}) error {
for _, filePathName := range filePaths {
if strings.HasSuffix(*filePathName, ".tmpl") {
if err := os.Remove(*filePathName); err != nil {
log.Errorf("error while removing the template file [" + err.Error() + "]" + *filePathName)
return err
}
}
Expand All @@ -70,9 +77,11 @@ func ExecuteGhActions(filePaths []*string, data map[string]interface{}) error {
fileName := (*filePathName)[strings.LastIndex(*filePathName, utils.SubstrString)+1:]
createdFile, err := os.Create(strings.TrimSuffix(*filePathName, utils.TemplateExtension))
if err != nil {
log.Errorf("error while creating the file [" + err.Error() + "]" + *filePathName)
return err
}
if err0 := parsedTemplates.ExecuteTemplate(createdFile, fileName, data); err0 != nil {
log.Errorf("error while executing the template [" + err0.Error() + "]" + *filePathName)
return err0
}
}
Expand All @@ -81,6 +90,7 @@ func ExecuteGhActions(filePaths []*string, data map[string]interface{}) error {
for _, filePathName := range filePaths {
if strings.HasSuffix(*filePathName, ".tmpl") {
if err := os.Remove(*filePathName); err != nil {
log.Errorf("error while removing the template file [" + err.Error() + "]" + *filePathName)
return err
}
}
Expand Down
12 changes: 8 additions & 4 deletions internal/languages/golang/frameworks/go-gin-server/copier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,11 @@ func (c *Copier) copySQLDBResourceFiles(resourceName string, filePaths []*string
// CreateRestConfigs creates/copies relevant files to a generated project
func (c *Copier) CreateRestConfigs() error {
if err := c.CreateRestServer(); err != nil {
log.Debugf("error creating rest server: %v", err)
log.Errorf("error creating rest server: %v", err)
return err
}
if err := c.CreateRestClients(); err != nil {
log.Debugf("error creating rest clients: %v", err)
log.Errorf("error creating rest clients: %v", err)
return err
}
return nil
Expand All @@ -638,13 +638,13 @@ func (c *Copier) CreateRestServer() error {
if c.IsRestServer {
// create directories for controller, service, dao, models
if err := c.createRestServerDirectories(); err != nil {
log.Debugf("error creating rest server directories: %v", err)
log.Errorf("error creating rest server directories: %v", err)
return err
}
// copy files with respect to the names of resources
for _, resource := range c.Resources {
if err := c.copyRestServerResourceFiles(resource); err != nil {
log.Debugf("error copying rest server resource files: %v", err)
log.Errorf("error copying rest server resource files: %v", err)
return err
}
}
Expand Down Expand Up @@ -749,12 +749,14 @@ func (c *Copier) CreateRestClients() error {
if c.HasRestClients {
// create directories for a client
if err := c.createRestClientDirectories(); err != nil {
log.Errorf("error creating rest client directories: %v", err)
return err
}

// copy files with respect to the names of resources
for _, client := range c.RestClients {
if err := c.copyRestClientResourceFiles(client); err != nil {
log.Errorf("error copying rest client resource files: %v", err)
return err
}
}
Expand All @@ -766,10 +768,12 @@ func (c *Copier) CreateRestClients() error {
func (c *Copier) CreateRootLevelFiles() error {
err := utils.CopyFiles(c.NodeDirectoryName, c.TemplatesRootPath)
if err != nil {
log.Errorf("error copying root level files: %v", err)
return err
}
_, files, err0 := utils.GetDirectoriesAndFilePaths(c.NodeDirectoryName)
if err0 != nil {
log.Errorf("error getting directories and file paths: %v", err0)
return err0
}
return executor.Execute(files, c.Data)
Expand Down
33 changes: 21 additions & 12 deletions internal/languages/golang/frameworks/go-grpc-server/copier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ func NewCopier(gitPlatformURL, gitPlatformUserName, gitRepositoryName, nodeName,
func (c *Copier) createGrpcClientDirectories() error {
clientDirectory := c.NodeDirectoryName + GrpcClientPath
if err := utils.CreateDirectories(clientDirectory); err != nil {
log.Errorf("error creating client directory: %v", err)
return err
}

Expand Down Expand Up @@ -665,9 +666,11 @@ func (c *Copier) getCreateQueryColumns(createQueryColumns *string, key string, v
// CreateGrpcConfigs creates/copies relevant files to a generated project
func (c *Copier) CreateGrpcConfigs() error {
if err := c.CreateGrpcServer(); err != nil {
log.Errorf("error creating grpc server: %v", err)
return err
}
if err := c.CreateGrpcClients(); err != nil {
log.Errorf("error creating grpc clients: %v", err)
return err
}
return nil
Expand All @@ -679,11 +682,13 @@ func (c *Copier) CreateGrpcServer() error {
if c.IsGrpcServer {
// create directories for controller, service, dao[for every resource's db clients], models
if err := c.createGrpcServerDirectories(); err != nil {
log.Errorf("error creating grpc server directories: %v", err)
return err
}
// copy files with respect to the names of resources
for _, resource := range c.Resources {
if err := c.copyGrpcServerResourceFiles(resource); err != nil {
log.Errorf("error copying grpc server resource files: %v", err)
return err
}
}
Expand All @@ -694,13 +699,13 @@ func (c *Copier) CreateGrpcServer() error {
targetOpenTelConfigFileName := c.NodeDirectoryName + ConfigPath + "/" + ConfigFile
_, err := utils.CopyFile(targetOpenTelConfigFileName, c.TemplatesRootPath+ConfigPath+"/"+ConfigFile)
if err != nil {
log.Debugf("error copying opentel config file: %v", err)
log.Errorf("error copying opentel config file: %v", err)
return err
}
filePaths = append(filePaths, &targetOpenTelConfigFileName)
err = executor.Execute(filePaths, c.Data)
if err != nil {
log.Debugf("error executing opentel config file: %v", err)
log.Errorf("error executing opentel config file: %v", err)
return err
}

Expand All @@ -711,8 +716,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetSQLiteConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + SqliteDBConfigFile
_, err := utils.CopyFile(targetSQLiteConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+SqliteDBConfigFile)
_, err = utils.CopyFile(targetSQLiteConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+SqliteDBConfigFile)
if err != nil {
log.Errorf("error copying sqlite config file: %v", err)
return err
}
filePaths = append(filePaths, &targetSQLiteConfigFileName)
Expand All @@ -721,8 +727,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetMySQLConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + MySQLDBConfigFile
_, err := utils.CopyFile(targetMySQLConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MySQLDBConfigFile)
_, err = utils.CopyFile(targetMySQLConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MySQLDBConfigFile)
if err != nil {
log.Errorf("error copying mysql config file: %v", err)
return err
}
filePaths = append(filePaths, &targetMySQLConfigFileName)
Expand All @@ -731,9 +738,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetSQLiteConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + SQLiteGORMDBConfigFile
_, err := utils.CopyFile(targetSQLiteConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+SQLiteGORMDBConfigFile)
_, err = utils.CopyFile(targetSQLiteConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+SQLiteGORMDBConfigFile)
if err != nil {
log.Debugf("error copying sqlite gorm config file: %v", err)
log.Errorf("error copying sqlite gorm config file: %v", err)
return err
}
filePaths = append(filePaths, &targetSQLiteConfigFileName)
Expand All @@ -742,9 +749,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetMySQLConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + MySQLGORMDBConfigFile
_, err := utils.CopyFile(targetMySQLConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MySQLGORMDBConfigFile)
_, err = utils.CopyFile(targetMySQLConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MySQLGORMDBConfigFile)
if err != nil {
log.Debugf("error copying mysql gorm config file: %v", err)
log.Errorf("error copying mysql gorm config file: %v", err)
return err
}
filePaths = append(filePaths, &targetMySQLConfigFileName)
Expand All @@ -753,9 +760,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetMapConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + MapDBConfigFile
_, err := utils.CopyFile(targetMapConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MapDBConfigFile)
_, err = utils.CopyFile(targetMapConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MapDBConfigFile)
if err != nil {
log.Debugf("error copying map config file: %v", err)
log.Errorf("error copying map config file: %v", err)
return err
}
filePaths = append(filePaths, &targetMapConfigFileName)
Expand All @@ -768,9 +775,9 @@ func (c *Copier) CreateGrpcServer() error {
var filePaths []*string
// client files
targetMongoDBConfigFileName := c.NodeDirectoryName + NoSQLDBClientsPath + "/" + MongoDBConfigFile
_, err := utils.CopyFile(targetMongoDBConfigFileName, c.TemplatesRootPath+NoSQLDBClientsPath+"/"+MongoDBConfigFile)
_, err = utils.CopyFile(targetMongoDBConfigFileName, c.TemplatesRootPath+NoSQLDBClientsPath+"/"+MongoDBConfigFile)
if err != nil {
log.Debugf("error copying mongodb config file: %v", err)
log.Errorf("error copying mongodb config file: %v", err)
return err
}
filePaths = append(filePaths, &targetMongoDBConfigFileName)
Expand All @@ -785,6 +792,7 @@ func (c *Copier) CreateGrpcServer() error {
func (c *Copier) CreateGrpcClients() error {
// create directories for a client
if err := c.createGrpcClientDirectories(); err != nil {
log.Errorf("error creating grpc client directories: %v", err)
return err
}
// if the node is client, add client code
Expand All @@ -800,6 +808,7 @@ func (c *Copier) CreateGrpcClients() error {
if c.IsGrpcServer {
// create self-client
if err := c.copySelfGrpcClientResourceFiles(); err != nil {
log.Errorf("error copying self grpc client resource files: %v", err)
return err
}
}
Expand Down
1 change: 1 addition & 0 deletions internal/languages/golang/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ func generateRESTConfig(ctx context.Context, goValues *GoValues) error {
}

if err := languages.ProcessOpenAPITemplate(ctx); err != nil {
log.Errorf("err : %s", err)
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/languages/golang/integrations/kubernetes/copier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ func (c Copier) CreateKubernetesFiles() error {

var filePaths []*string
if c.IsRestServer || c.IsGrpcServer {
// copy service files to generated kubernetes manifests
// copy service files to the generated kubernetes manifests
targetKubernetesServiceFileName := c.NodeDirectoryName + Path + "/" + ServiceFile
_, err := utils.CopyFile(targetKubernetesServiceFileName, c.TemplatesRootPath+Path+"/"+ServiceFile)
if err != nil {
return err
}
filePaths = append(filePaths, &targetKubernetesServiceFileName)
}
// copy deployment files to generated kubernetes manifests
// copy deployment files to the generated kubernetes manifests
targetKubernetesDeploymentFileName := c.NodeDirectoryName + Path + "/" + DeploymentFile
_, err := utils.CopyFile(targetKubernetesDeploymentFileName, c.TemplatesRootPath+Path+"/"+DeploymentFile)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions internal/languages/java/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func Generate(ctx context.Context) error {
return errors.New("at least rest-config needs to be provided, OpenAPIFileYamlContent is empty")
}
if err := languages.ProcessOpenAPITemplate(ctx); err != nil {
log.Errorf("err : %s", err)
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/languages/java/integrations/kubernetes/copier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (c Copier) CreateKubernetesFiles() error {

var filePaths []*string
if c.IsRestServer {
// copy service files to generated kubernetes manifests
// copy service files to the generated kubernetes manifests
targetKubernetesServiceFileName := c.NodeDirectoryName + Path + "/" + ServiceFile
_, err := utils.CopyFile(targetKubernetesServiceFileName, c.TemplatesRootPath+Path+"/"+ServiceFile)
if err != nil {
Expand All @@ -61,7 +61,7 @@ func (c Copier) CreateKubernetesFiles() error {
}
filePaths = append(filePaths, &targetKubernetesServiceFileName)
}
// copy deployment files to other generated kubernetes manifests
// copy deployment files to the generated kubernetes manifests
targetKubernetesDeploymentFileName := c.NodeDirectoryName + Path + "/" + DeploymentFile
_, err := utils.CopyFile(targetKubernetesDeploymentFileName, c.TemplatesRootPath+Path+"/"+DeploymentFile)
if err != nil {
Expand Down
Loading

0 comments on commit b364253

Please sign in to comment.