[content-service] Refactor to use baseserver #9973
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,24 +5,11 @@ | |
| package cmd | ||
|
|
||
| import ( | ||
| "github.com/gitpod-io/gitpod/common-go/baseserver" | ||
| "github.com/gitpod-io/gitpod/common-go/log" | ||
| "github.com/gitpod-io/gitpod/content-service/api" | ||
| "github.com/gitpod-io/gitpod/content-service/pkg/service" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // runCmd starts the content service | ||
|
|
@@ -32,106 +19,48 @@ var runCmd = &cobra.Command{ | |
|
|
||
| Run: func(cmd *cobra.Command, args []string) { | ||
| cfg := getConfig() | ||
|
|
||
| srv, err := baseserver.New("content-service", | ||
| baseserver.WithGRPC(&cfg.Service), | ||
| ) | ||
| if err != nil { | ||
| log.WithError(err).Fatal("Failed to create server.") | ||
| } | ||
|
|
||
| contentService, err := service.NewContentService(cfg.Storage) | ||
| if err != nil { | ||
| log.WithError(err).Fatalf("Cannot create content service") | ||
|
There was a problem hiding this comment. please leave this lowercase. The vast majority of our error messages is lowercase, and we should keep things consistent There was a problem hiding this comment. General practice in Go (and elsewhere) is to uppercase logs to make them sentences. They are designed to be consumed by humans and first letter uppercase is slightly easier to visually grep. Even our style guide uses first letter uppercase in logs https://github.com/uber-go/guide/blob/master/style.md#reduce-nesting The change here is really just a drive by improvement to be more consistent with general practice. Errors, on the other hand, should never start with an uppercase because they get wrapped and composed so don't really form sentences. There was a problem hiding this comment. Here's another reference from go code review style guide There was a problem hiding this comment. Fair point. /hold cancel |
||
| } | ||
| api.RegisterContentServiceServer(srv.GRPC(), contentService) | ||
|
|
||
| blobService, err := service.NewBlobService(cfg.Storage) | ||
| if err != nil { | ||
| log.WithError(err).Fatalf("Cannot create blobs service") | ||
| } | ||
| api.RegisterBlobServiceServer(srv.GRPC(), blobService) | ||
|
|
||
| workspaceService, err := service.NewWorkspaceService(cfg.Storage) | ||
| if err != nil { | ||
| log.WithError(err).Fatalf("Cannot create workspace service") | ||
| } | ||
| api.RegisterWorkspaceServiceServer(srv.GRPC(), workspaceService) | ||
|
|
||
| headlessLogService, err := service.NewHeadlessLogService(cfg.Storage) | ||
| if err != nil { | ||
| log.WithError(err).Fatalf("Cannot create log service") | ||
| } | ||
| api.RegisterHeadlessLogServiceServer(srv.GRPC(), headlessLogService) | ||
|
|
||
| idePluginService, err := service.NewIDEPluginService(cfg.Storage) | ||
| if err != nil { | ||
| log.WithError(err).Fatalf("Cannot create IDE Plugin service") | ||
| } | ||
| api.RegisterIDEPluginServiceServer(srv.GRPC(), idePluginService) | ||
|
|
||
| err = srv.ListenAndServe() | ||
| if err != nil { | ||
| log.WithError(err).Fatal("Cannot start server") | ||
| } | ||
| }, | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TLS config is now part of
baseserverso using it directly.