maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(server): Clean up cache implementation

Browse source 
A couple of minor fixes and improvements to the cache implementation.
This commit is contained in:
Vincent Ambo 2019-10-02 18:00:35 +01:00 • committed by Vincent Ambo
parent 0698d7f2aa
commit 1308a6e1fd
3 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/nixery/server/main.go
View file

@ -81,15 +81,15 @@ func constructLayerUrl(cfg *config.Config, digest string) (string, error) {
//
// The bucket is required for Nixery to function correctly, hence fatal errors
// are generated in case it fails to be set up correctly.
func prepareBucket(ctx *context.Context, cfg *config.Config) *storage.BucketHandle {
client, err := storage.NewClient(*ctx)
func prepareBucket(ctx context.Context, cfg *config.Config) *storage.BucketHandle {
client, err := storage.NewClient(ctx)
if err != nil {
log.Fatalln("Failed to set up Cloud Storage client:", err)
}
bkt := client.Bucket(cfg.Bucket)
if _, err := bkt.Attrs(*ctx); err != nil {
if _, err := bkt.Attrs(ctx); err != nil {
log.Fatalln("Could not access configured bucket", err)
}
@ -194,7 +194,7 @@ func main() {
}
ctx := context.Background()
bucket := prepareBucket(&ctx, cfg)
bucket := prepareBucket(ctx, cfg)
state := builder.NewState(bucket, *cfg)
log.Printf("Starting Nixery on port %s\n", cfg.Port)