Cleaned up unecessary logs and fixed notification mapping

Shuffle · Oct 1, 2024 · 8eb7b81 · 8eb7b81
1 parent 0b72b8b
commit 8eb7b81
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/detection.go b/detection.go
@@ -39,7 +39,7 @@ func HandleDetectionHealthUpdate(resp http.ResponseWriter, request *http.Request
 		return
 	}
 
-	log.Printf("[DEBUG] Tenzir health update: %#v", healthUpdate)
+	//log.Printf("[DEBUG] Tenzir health update: %#v", healthUpdate)
 
 	//ctx := context.Background()
 	/*

diff --git a/notifications.go b/notifications.go
@@ -781,7 +781,7 @@ func CreateOrgNotification(ctx context.Context, title, description, referenceUrl
 		} else {
 			err = sendToNotificationWorkflow(ctx, mainNotification, selectedApikey, org.Defaults.NotificationWorkflow, false)
 			if err != nil {
-				if !strings.Contains(err.Error(), "cache stored") {
+				if !strings.Contains(err.Error(), "cache stored") && !strings.Contains(err.Error(), "Same workflow") {
 					log.Printf("[ERROR] Failed sending notification to workflowId %s for reference %s (2): %s", org.Defaults.NotificationWorkflow, mainNotification.Id, err)
 				}
 			}
@@ -907,6 +907,8 @@ func HandleCreateNotification(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	//log.Printf("[DEBUG] Creating notification based on: %s", string(body))
+
 	notification := Notification{}
 	err = json.Unmarshal(body, &notification)
 	if err != nil {

diff --git a/oauth2.go b/oauth2.go
@@ -3919,7 +3919,8 @@ func RunOauth2Request(ctx context.Context, user User, appAuth AppAuthenticationS
 	}
 
 	if strings.Contains(string(respBody), "error") {
-		log.Printf("\n\n[ERROR] Oauth2 RESPONSE: %s\n\nencoded: %#v", string(respBody), v.Encode())
+		//log.Printf("\n\n[ERROR] Oauth2 RESPONSE: %s\n\nencoded: %#v\n", string(respBody), v.Encode())
+		log.Printf("\n\n[ERROR] Oauth2 RESPONSE from %s: %s", url, string(respBody))
 	}
 
 	// Check if we have an authentication token and pre-set it

diff --git a/shared.go b/shared.go
@@ -23843,12 +23843,12 @@ func GetExternalClient(baseUrl string) *http.Client {
 		}
 
 		certDir := "/certs/"
-
 		if os.Getenv("SHUFFLE_CERT_DIR") != "" {
 			certDir = os.Getenv("SHUFFLE_CERT_DIR")
+
+			log.Printf("[INFO] Reading self signed certificates from custom dir '%s'", certDir)
 		}
 
-		log.Printf("[INFO] Reading self signed certificates from %s dir", certDir)
 
 		files, err := os.ReadDir(certDir)
 		if err == nil && os.Getenv("SHUFFLE_CERT_DIR") != "" {
@@ -23865,6 +23865,7 @@ func GetExternalClient(baseUrl string) *http.Client {
 					}
 				}
 			}
+
 			transport.TLSClientConfig = &tls.Config{RootCAs: rootCAs}
 		}
 	}