From c2d1c3fce9b9b69060c5d844ee81840ba905a249 Mon Sep 17 00:00:00 2001 From: Damien Murphy Date: Fri, 4 Aug 2023 08:44:41 -0700 Subject: [PATCH] Replace log.Fatal with log.Panic to avoid crashing the application --- deepgram/billing.go | 8 ++++---- deepgram/invitations.go | 8 ++++---- deepgram/keys.go | 18 +++++++++--------- deepgram/members.go | 20 ++++++++++---------- deepgram/prerecorded.go | 6 +++--- deepgram/projects.go | 18 +++++++++--------- deepgram/transcriptions.go | 2 +- deepgram/usage.go | 16 ++++++++-------- examples/liveTranscription_example.go | 6 +++--- examples/preRecordedFromStream_example.go | 6 +++--- examples/preRecordedFromUrl_example.go | 4 ++-- 11 files changed, 56 insertions(+), 56 deletions(-) diff --git a/deepgram/billing.go b/deepgram/billing.go index 3eb75e96..acf4b4ac 100644 --- a/deepgram/billing.go +++ b/deepgram/billing.go @@ -26,7 +26,7 @@ func (dg *Client) ListBalances(projectId string) (BalanceList, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -43,7 +43,7 @@ func (dg *Client) ListBalances(projectId string) (BalanceList, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -62,7 +62,7 @@ func (dg *Client) GetBalance(projectId string, balanceId string) (Balance, error req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -79,7 +79,7 @@ func (dg *Client) GetBalance(projectId string, balanceId string) (Balance, error } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/deepgram/invitations.go b/deepgram/invitations.go index e611459f..b80bc987 100644 --- a/deepgram/invitations.go +++ b/deepgram/invitations.go @@ -17,7 +17,7 @@ func (dg *Client) ListInvitations(projectId string) (InvitationList, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -47,13 +47,13 @@ func (dg *Client) SendInvitation(projectId string, options InvitationOptions) (M u := url.URL{Scheme: "https", Host: dg.Host, Path: path} jsonStr, err := json.Marshal(options) if err != nil { - log.Fatal(err) + log.Panic(err) return Message{}, err } req, err := http.NewRequest("POST", u.String(), bytes.NewBuffer(jsonStr)) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -88,7 +88,7 @@ func (dg *Client) DeleteInvitation(projectId string, email string) (Message, err req, err := http.NewRequest("DELETE", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ diff --git a/deepgram/keys.go b/deepgram/keys.go index 612e8501..715f47b8 100644 --- a/deepgram/keys.go +++ b/deepgram/keys.go @@ -48,7 +48,7 @@ func (dg *Client) ListKeys(projectId string) (KeyResponse, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -65,7 +65,7 @@ func (dg *Client) ListKeys(projectId string) (KeyResponse, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -84,7 +84,7 @@ func (dg *Client) GetKey(projectId string, keyId string) (KeyResponseObj, error) req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -102,7 +102,7 @@ func (dg *Client) GetKey(projectId string, keyId string) (KeyResponseObj, error) if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -130,7 +130,7 @@ func (dg *Client) CreateKey(projectId string, comment string, scopes []string, o fmt.Println(string(out)) buf := bytes.NewBuffer(out) if err != nil { - log.Fatal(err) + log.Panic(err) } client := new(http.Client) path := fmt.Sprintf("%s/%s/keys", dg.Path, projectId) @@ -138,7 +138,7 @@ func (dg *Client) CreateKey(projectId string, comment string, scopes []string, o req, err := http.NewRequest("POST", u.String(), buf) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -156,7 +156,7 @@ func (dg *Client) CreateKey(projectId string, comment string, scopes []string, o if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -175,7 +175,7 @@ func (dg *Client) DeleteKey(projectId string, keyId string) (Message, error) { req, err := http.NewRequest("DELETE", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -192,7 +192,7 @@ func (dg *Client) DeleteKey(projectId string, keyId string) (Message, error) { if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/deepgram/members.go b/deepgram/members.go index babdad63..4b084cc3 100644 --- a/deepgram/members.go +++ b/deepgram/members.go @@ -32,7 +32,7 @@ func (dg *Client) ListMembers(projectId string) (MemberList, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -49,7 +49,7 @@ func (dg *Client) ListMembers(projectId string) (MemberList, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -68,7 +68,7 @@ func (dg *Client) RemoveMember(projectId string, memberId string) (Message, erro req, err := http.NewRequest("DELETE", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -85,7 +85,7 @@ func (dg *Client) RemoveMember(projectId string, memberId string) (Message, erro } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -104,7 +104,7 @@ func (dg *Client) GetMemberScopes(projectId string, memberId string) (ScopeList, req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -121,7 +121,7 @@ func (dg *Client) GetMemberScopes(projectId string, memberId string) (ScopeList, } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -145,7 +145,7 @@ func (dg *Client) UpdateMemberScopes(projectId string, memberId string, scope st req, err := http.NewRequest("PUT", u.String(), strings.NewReader(newScope)) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -163,7 +163,7 @@ func (dg *Client) UpdateMemberScopes(projectId string, memberId string, scope st if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -182,7 +182,7 @@ func (dg *Client) LeaveProject(projectId string) (Message, error) { req, err := http.NewRequest("DELETE", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -200,7 +200,7 @@ func (dg *Client) LeaveProject(projectId string) (Message, error) { if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/deepgram/prerecorded.go b/deepgram/prerecorded.go index 35ae64f5..e4809a69 100644 --- a/deepgram/prerecorded.go +++ b/deepgram/prerecorded.go @@ -231,14 +231,14 @@ func (dg *Client) PreRecordedFromURL(source UrlSource, options PreRecordedTransc u := url.URL{Scheme: "https", Host: dg.Host, Path: dg.TranscriptionPath, RawQuery: query.Encode()} jsonStr, err := json.Marshal(source) if err != nil { - log.Fatal(err) + log.Panic(err) return PreRecordedResponse{}, err } req, err := http.NewRequest("POST", u.String(), bytes.NewBuffer(jsonStr)) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -255,7 +255,7 @@ func (dg *Client) PreRecordedFromURL(source UrlSource, options PreRecordedTransc } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/deepgram/projects.go b/deepgram/projects.go index 48d70f1f..bcb4c7f2 100644 --- a/deepgram/projects.go +++ b/deepgram/projects.go @@ -32,7 +32,7 @@ func (dg *Client) ListProjects() (ProjectResponse, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -49,7 +49,7 @@ func (dg *Client) ListProjects() (ProjectResponse, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -68,7 +68,7 @@ func (dg *Client) GetProject(projectId string) (Project, error) { req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -85,7 +85,7 @@ func (dg *Client) GetProject(projectId string) (Project, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -103,13 +103,13 @@ func (dg *Client) UpdateProject(projectId string, options ProjectUpdateOptions) u := url.URL{Scheme: "https", Host: dg.Host, Path: path} jsonStr, err := json.Marshal(options) if err != nil { - log.Fatal(err) + log.Panic(err) return Message{}, err } req, err := http.NewRequest("PATCH", u.String(), bytes.NewBuffer(jsonStr)) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -126,7 +126,7 @@ func (dg *Client) UpdateProject(projectId string, options ProjectUpdateOptions) } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -146,7 +146,7 @@ func (dg *Client) DeleteProject(projectId string) (Message, error) { req, err := http.NewRequest("DELETE", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -163,7 +163,7 @@ func (dg *Client) DeleteProject(projectId string) (Message, error) { } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/deepgram/transcriptions.go b/deepgram/transcriptions.go index 0f077681..3dd4f267 100644 --- a/deepgram/transcriptions.go +++ b/deepgram/transcriptions.go @@ -59,7 +59,7 @@ func (dg *Client) LiveTranscription(options LiveTranscriptionOptions) (*websocke if err != nil { log.Printf("handshake failed with status %s", resp.Status) - log.Fatal("dial:", err) + log.Panic("dial:", err) } return c, resp, nil } diff --git a/deepgram/usage.go b/deepgram/usage.go index 15ee88ba..19abf718 100644 --- a/deepgram/usage.go +++ b/deepgram/usage.go @@ -90,7 +90,7 @@ func (dg *Client) ListRequests(projectId string, options UsageRequestListOptions req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -107,7 +107,7 @@ func (dg *Client) ListRequests(projectId string, options UsageRequestListOptions } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -127,7 +127,7 @@ func (dg *Client) GetRequest(projectId string, requestId string) (UsageRequest, req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -144,7 +144,7 @@ func (dg *Client) GetRequest(projectId string, requestId string) (UsageRequest, } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -164,7 +164,7 @@ func (dg *Client) GetFields(projectId string, options UsageRequestListOptions) ( req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -181,7 +181,7 @@ func (dg *Client) GetFields(projectId string, options UsageRequestListOptions) ( } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) @@ -201,7 +201,7 @@ func (dg *Client) GetUsage(projectId string, options UsageOptions) (UsageSummary req, err := http.NewRequest("GET", u.String(), nil) if err != nil { //Handle Error - log.Fatal(err) + log.Panic(err) } req.Header = http.Header{ @@ -218,7 +218,7 @@ func (dg *Client) GetUsage(projectId string, options UsageOptions) (UsageSummary } if res.StatusCode != 200 { b, _ := io.ReadAll(res.Body) - log.Fatal(string(b)) + log.Panic(string(b)) } jsonErr := GetJson(res, &result) diff --git a/examples/liveTranscription_example.go b/examples/liveTranscription_example.go index 7106d5f4..e3cd530f 100644 --- a/examples/liveTranscription_example.go +++ b/examples/liveTranscription_example.go @@ -38,12 +38,12 @@ func main() { _, message, err := dgConn.ReadMessage() if err != nil { fmt.Println("ERROR reading message") - log.Fatal(err) + log.Panic(err) } jsonParsed, jsonErr := gabs.ParseJSON(message) if jsonErr != nil { - log.Fatal(err) + log.Panic(err) } log.Printf("recv: %s", jsonParsed.Path("channel.alternatives.0.transcript").String()) @@ -55,7 +55,7 @@ func main() { if err != nil { fmt.Println("ERROR reading chunk") - log.Fatal(err) + log.Panic(err) } dgConn.WriteMessage(websocket.BinaryMessage, chunk[:bytesRead]) time.Sleep(10 * time.Millisecond) diff --git a/examples/preRecordedFromStream_example.go b/examples/preRecordedFromStream_example.go index 92b0dbf2..e62fcadf 100644 --- a/examples/preRecordedFromStream_example.go +++ b/examples/preRecordedFromStream_example.go @@ -21,7 +21,7 @@ func main() { dg := deepgram.NewClient(*key) file, err := os.Open(*file) if err != nil { - log.Fatalf("error opening file %s: %v", *file, err) + log.Panicf("error opening file %s: %v", *file, err) } source := deepgram.ReadStreamSource{Stream: file, Mimetype: *mimetype} res, err := dg.PreRecordedFromStream(source, deepgram.PreRecordedTranscriptionOptions{Punctuate: true, Diarize: true, Language: "en-US", Utterances: true}) @@ -38,7 +38,7 @@ func main() { // Convert the results to WebVTT format vtt, err := res.ToWebVTT() if err != nil { - log.Fatal(err) + log.Panic(err) } f.WriteString(vtt) @@ -49,7 +49,7 @@ func main() { } srt, err := res.ToSRT() if err != nil { - log.Fatal(err) + log.Panic(err) } srtF.WriteString(srt) diff --git a/examples/preRecordedFromUrl_example.go b/examples/preRecordedFromUrl_example.go index a0efa816..b79d2115 100644 --- a/examples/preRecordedFromUrl_example.go +++ b/examples/preRecordedFromUrl_example.go @@ -25,7 +25,7 @@ func main() { // Convert the results to WebVTT format vtt, err := res.ToWebVTT() if err != nil { - log.Fatal(err) + log.Panic(err) } f.WriteString(vtt) @@ -36,7 +36,7 @@ func main() { } srt, err := res.ToSRT() if err != nil { - log.Fatal(err) + log.Panic(err) } srtF.WriteString(srt)