atridad/atridotdad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging and deps

Browse Source
This commit is contained in:
Atridad Lahiji
2024-05-08 14:43:57 -06:00
parent 994a2fabd6
commit 8fed511607
8 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/email.go
View File

@ -8,7 +8,7 @@ import (
)
func SendEmail(to_email string, from_email string, from_name string, html string, subject string) {
log.Println("Starting email sending process")
LogInfo.Println("Starting email sending process")
// Set up authentication information.
auth := smtp.PlainAuth(
@ -18,7 +18,7 @@ func SendEmail(to_email string, from_email string, from_name string, html string
os.Getenv("SMTP_HOST"),
)
log.Println("Authentication set up")
LogSuccess.Println("Authentication set up")
// Connect to the server, authenticate, set the sender and recipient,
// and send the email all in one step.
@ -34,69 +34,69 @@ func SendEmail(to_email string, from_email string, from_name string, html string
ServerName: os.Getenv("SMTP_HOST"),
}
log.Println("TLS configuration set up")
LogSuccess.Println("TLS configuration set up")
c, err := smtp.Dial(os.Getenv("SMTP_HOST") + ":587")
if err != nil {
log.Println("Error dialing SMTP server:", err)
LogError.Println("Error dialing SMTP server:", err)
return
}
log.Println("Connected to SMTP server")
LogSuccess.Println("Connected to SMTP server")
if err = c.StartTLS(tlsconfig); err != nil {
log.Println("Error starting TLS:", err)
LogError.Println("Error starting TLS:", err)
return
}
log.Println("TLS started")
LogInfo.Println("TLS started")
if err = c.Auth(auth); err != nil {
log.Println("Error authenticating with SMTP server:", err)
LogError.Println("Error authenticating with SMTP server:", err)
return
}
log.Println("Authenticated with SMTP server")
LogSuccess.Println("Authenticated with SMTP server")
if err = c.Mail(from_email); err != nil {
log.Println("Error setting sender address:", err)
LogError.Println("Error setting sender address:", err)
return
}
log.Println("Sender address set")
LogSuccess.Println("Sender address set")
if err = c.Rcpt(to_email); err != nil {
log.Println("Error setting recipient address:", err)
LogError.Println("Error setting recipient address:", err)
return
}
log.Println("Recipient address set")
LogSuccess.Println("Recipient address set")
w, err := c.Data()
if err != nil {
log.Println("Error getting write closer:", err)
LogError.Println("Error getting write closer:", err)
return
}
log.Println("Got write closer")
LogSuccess.Println("Got write closer")
_, err = w.Write(msg)
if err != nil {
log.Println("Error writing message:", err)
LogError.Println("Error writing message:", err)
return
}
log.Println("Message written")
LogSuccess.Println("Message written")
err = w.Close()
if err != nil {
log.Println("Error closing write closer:", err)
LogError.Println("Error closing write closer:", err)
return
}
log.Println("Write closer closed")
LogSuccess.Println("Write closer closed")
c.Quit()
log.Println("Email sent successfully")
LogSuccess.Println("Email sent successfully")
}

22
lib/sse.go
View File

@ -3,7 +3,6 @@ package lib
import (
"context"
"fmt"
"log"
"net/http"
"sync"
@ -58,7 +57,8 @@ func (s *SSEServerType) ClientCount(channel string) int {
}
func SendSSE(ctx context.Context, messageBroker pubsub.PubSub, channel string, message string) error {
log.Printf("Sending SSE message to channel %s", channel)
LogInfo.Printf("Sending SSE message to channel %s", channel)
errCh := make(chan error, 1)
go func() {
@ -73,11 +73,13 @@ func SendSSE(ctx context.Context, messageBroker pubsub.PubSub, channel string, m
err := <-errCh
if err != nil {
log.Printf("Error sending SSE message: %v", err)
LogError.Printf("Error sending SSE message: %v", err)
return err
}
log.Println("SSE message sent successfully")
LogSuccess.Printf("SSE message sent successfully")
return nil
}
@ -89,7 +91,8 @@ func SetSSEHeaders(c echo.Context) {
func HandleIncomingMessages(c echo.Context, pubsub pubsub.PubSubMessage, client chan string) {
if c.Response().Writer == nil {
log.Println("Cannot handle incoming messages: ResponseWriter is nil")
LogError.Printf("Cannot handle incoming messages: ResponseWriter is nil")
return
}
@ -110,7 +113,8 @@ func HandleIncomingMessages(c echo.Context, pubsub pubsub.PubSubMessage, client
default:
msg, err := pubsub.ReceiveMessage(ctx)
if err != nil {
log.Printf("Failed to receive message: %v", err)
LogError.Printf("Failed to receive message: %v", err)
return
}
@ -120,7 +124,7 @@ func HandleIncomingMessages(c echo.Context, pubsub pubsub.PubSubMessage, client
if c.Response().Writer != nil {
_, err = c.Response().Write([]byte(data))
if err != nil {
log.Printf("Failed to write message: %v", err)
LogError.Printf("Failed to write message: %v", err)
mutex.Unlock()
return
}
@ -129,10 +133,10 @@ func HandleIncomingMessages(c echo.Context, pubsub pubsub.PubSubMessage, client
if ok {
flusher.Flush()
} else {
log.Println("Failed to flush: ResponseWriter does not implement http.Flusher")
LogError.Println("Failed to flush: ResponseWriter does not implement http.Flusher")
}
} else {
log.Println("Failed to write: ResponseWriter is nil")
LogError.Println("Failed to write: ResponseWriter is nil")
}
mutex.Unlock()
}

2
lib/stripe.go
View File

@ -34,7 +34,7 @@ func CreateCheckoutSession(w http.ResponseWriter, r *http.Request, successUrl st
s, err := session.New(params)
if err != nil {
log.Printf("session.New: %v", err)
LogError.Printf("session.New: %v", err)
}
http.Redirect(w, r, s.URL, http.StatusSeeOther)

4
lib/templates.go
View File

@ -28,14 +28,14 @@ func RenderTemplate(w http.ResponseWriter, layout string, partials []string, pro
// Parse the templates
ts, err := template.ParseFS(templatefs.FS, templates...)
if err != nil {
log.Print(err.Error())
LogError.Print(err.Error())
return err
}
// Execute the layout template
err = ts.ExecuteTemplate(w, layout, props)
if err != nil {
log.Print(err.Error())
LogError.Print(err.Error())
return err
}