From 4a6223786bfb1a1bb28c29b2f52312fa88e19bb8 Mon Sep 17 00:00:00 2001 From: Xavier Perret <xa.perret@outlook.com> Date: Sun, 30 Oct 2022 16:36:35 +0100 Subject: [PATCH] removed useless exit from app --- app/object-storage/object-storage.go | 32 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/app/object-storage/object-storage.go b/app/object-storage/object-storage.go index 38f9199..b5aa21f 100644 --- a/app/object-storage/object-storage.go +++ b/app/object-storage/object-storage.go @@ -42,28 +42,32 @@ func FakeTransaction(transactionToFake Transaction, fakeTransaction Transaction, func ReadDatabaseFromBlobStorage(blob Blob) Database { ctx := context.Background() + var database Database // Download the blob get, err := blob.BlockBlobClient.Download(ctx, nil) if err != nil { - log.Fatal(err) + log.Println(err) + return database } downloadedData := &bytes.Buffer{} reader := get.Body(azblob.RetryReaderOptions{}) _, err = downloadedData.ReadFrom(reader) if err != nil { - log.Fatal(err) + log.Println(err) + return database } err = reader.Close() if err != nil { - log.Fatal(err) + log.Println(err) + return database } - var database Database err = json.Unmarshal(downloadedData.Bytes(), &database) if err != nil { - log.Fatal(err) + log.Println(err) + return database } fmt.Println(downloadedData.String()) @@ -75,23 +79,23 @@ func readGivenBlobFromContainer(blob Blob, data any) any { ctx := context.Background() get, err := blob.BlockBlobClient.Download(ctx, nil) if err != nil { - log.Fatal(err) + log.Println(err) } downloadedData := &bytes.Buffer{} reader := get.Body(azblob.RetryReaderOptions{}) _, err = downloadedData.ReadFrom(reader) if err != nil { - log.Fatal(err) + log.Println(err) } err = reader.Close() if err != nil { - log.Fatal(err) + log.Println(err) } err = json.Unmarshal(downloadedData.Bytes(), &data) if err != nil { - log.Fatal(err) + log.Println(err) } fmt.Println(downloadedData.String()) @@ -106,7 +110,7 @@ func WriteDatabaseToBlobStorage(database Database, blob Blob) { _, err = blob.BlockBlobClient.UploadBufferToBlockBlob(ctx, data, azblob.HighLevelUploadToBlockBlobOption{}) if err != nil { - log.Fatalf("Failure to upload to blob: %+v", err) + log.Printf("Failure to upload to blob: %+v", err) } } @@ -118,7 +122,7 @@ func writeGivenDataToBlob(blob Blob, data any) { _, err = blob.BlockBlobClient.UploadBufferToBlockBlob(ctx, dataBytes, azblob.HighLevelUploadToBlockBlobOption{}) if err != nil { - log.Fatalf("Failure to upload to blob: %+v", err) + log.Printf("Failure to upload to blob: %+v", err) } } @@ -137,12 +141,12 @@ func InitAzureCredentials(storageAccountName string) AzureCredentials { // Create a default request pipeline using your storage account name and account key. credential, err := azidentity.NewDefaultAzureCredential(nil) if err != nil { - log.Fatal("Invalid credentials with error: " + err.Error()) + log.Println("Invalid credentials with error: " + err.Error()) } serviceClient, err := azblob.NewServiceClient(url, credential, nil) if err != nil { - log.Fatal("Invalid credentials with error: " + err.Error()) + log.Println("Invalid credentials with error: " + err.Error()) } newAzureCredentials := AzureCredentials{ @@ -212,7 +216,7 @@ func ListBlobs(blob Blob) { } if err := pager.Err(); err != nil { - log.Fatalf("Failure to list blobs: %+v", err) + log.Printf("Failure to list blobs: %+v", err) } } -- GitLab