mirror of
https://github.com/GRFreire/nthmail.git
synced 2026-01-08 12:29:38 +00:00
integrate web and mail server
now, there is only one binary that starts both servers, making them use the same SQL connection. this commit also added some `defer tx.Commit()` to ensure all the transactions were closed
This commit is contained in:
Guilherme Rugai Freire
parent
52b3fa61ca
commit
48e7b5a9a5
10
Makefile
10
Makefile
@ -1,8 +1,4 @@
|
||||
all: mail web
|
||||
|
||||
mail:
|
||||
go build -o "./bin/$@_server" "./cmd/mail_server"
|
||||
|
||||
web:
|
||||
all:
|
||||
templ generate
|
||||
go build -o "./bin/$@_server" "./cmd/web_server"
|
||||
go build -o ./bin/server ./cmd/server
|
||||
|
||||
|
||||
34
cmd/server/main.go
Normal file
34
cmd/server/main.go
Normal file
@ -0,0 +1,34 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"github.com/GRFreire/nthmail/pkg/mail_server"
|
||||
"github.com/GRFreire/nthmail/pkg/web_server"
|
||||
"log"
|
||||
"sync"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
func main() {
|
||||
db, err := sql.Open("sqlite3", "./db.db")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(1)
|
||||
go func(db *sql.DB) {
|
||||
defer wg.Done()
|
||||
mail_server.Start(db)
|
||||
}(db)
|
||||
|
||||
wg.Add(1)
|
||||
go func(db *sql.DB) {
|
||||
defer wg.Done()
|
||||
web_server.Start(db)
|
||||
}(db)
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
@ -1,7 +1,8 @@
|
||||
package main
|
||||
package mail_server
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
@ -52,6 +53,7 @@ func (session *Session) Rcpt(to string, opts *smtp.RcptOptions) error {
|
||||
}
|
||||
|
||||
func (session *Session) Data(reader io.Reader) error {
|
||||
defer session.tx.Rollback()
|
||||
if bytes, err := io.ReadAll(reader); err != nil {
|
||||
return err
|
||||
} else {
|
||||
@ -85,13 +87,7 @@ func (session *Session) Logout() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
db, err := sql.Open("sqlite3", "./db.db")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
func Start(db *sql.DB) error {
|
||||
backend := &Backend{
|
||||
db: db,
|
||||
}
|
||||
@ -104,11 +100,12 @@ func main() {
|
||||
}
|
||||
|
||||
var port int
|
||||
var err error
|
||||
port_str, exists := os.LookupEnv("MAIL_SERVER_PORT")
|
||||
if exists {
|
||||
port, err = strconv.Atoi(port_str)
|
||||
if err != nil {
|
||||
log.Fatal("env:MAIL_SERVER_PORT is not a number")
|
||||
return errors.New("env:MAIL_SERVER_PORT is not a number")
|
||||
}
|
||||
} else {
|
||||
port = 1025
|
||||
@ -124,6 +121,8 @@ func main() {
|
||||
|
||||
log.Println("Starting server at", server.Addr)
|
||||
if err := server.ListenAndServe(); err != nil {
|
||||
log.Fatal(err)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
templ header(rcpt_addr string) {
|
||||
<div class="header">
|
||||
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
templ index_page() {
|
||||
<!DOCTYPE html>
|
||||
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
import (
|
||||
"github.com/russross/blackfriday/v2"
|
||||
@ -1,7 +1,8 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
@ -15,15 +16,9 @@ import (
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
func main() {
|
||||
func Start(db *sql.DB) error {
|
||||
server := &ServerResouces{}
|
||||
|
||||
db, err := sql.Open("sqlite3", "./db.db")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
server.db = db
|
||||
defer db.Close()
|
||||
server.db = db
|
||||
|
||||
domain, exists := os.LookupEnv("MAIL_SERVER_DOMAIN")
|
||||
if !exists {
|
||||
@ -32,11 +27,12 @@ func main() {
|
||||
server.domain = domain
|
||||
|
||||
var port int
|
||||
var err error
|
||||
port_str, exists := os.LookupEnv("WEB_SERVER_PORT")
|
||||
if exists {
|
||||
port, err = strconv.Atoi(port_str)
|
||||
if err != nil {
|
||||
log.Fatal("env:MAIL_SERVER_PORT is not a number")
|
||||
return errors.New("env:WEB_SERVER_PORT is not a number")
|
||||
}
|
||||
} else {
|
||||
port = 3000
|
||||
@ -47,8 +43,10 @@ func main() {
|
||||
log.Println("Listening on port", port)
|
||||
err = http.ListenAndServe(fmt.Sprintf(":%d", port), router)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type ServerResouces struct {
|
||||
@ -100,6 +98,7 @@ func (sr ServerResouces) handleInbox(res http.ResponseWriter, req *http.Request)
|
||||
log.Println("could not begin db transaction")
|
||||
return
|
||||
}
|
||||
defer tx.Commit()
|
||||
|
||||
stmt, err := tx.Prepare("SELECT mails.id, mails.arrived_at, mails.rcpt_addr, mails.from_addr, mails.data FROM mails WHERE mails.rcpt_addr = ?")
|
||||
if err != nil {
|
||||
@ -175,6 +174,7 @@ func (sr ServerResouces) handleMail(res http.ResponseWriter, req *http.Request)
|
||||
log.Println("could not begin db transaction")
|
||||
return
|
||||
}
|
||||
defer tx.Commit()
|
||||
|
||||
stmt, err := tx.Prepare("SELECT mails.id, mails.arrived_at, mails.rcpt_addr, mails.from_addr, mails.data FROM mails WHERE mails.rcpt_addr = ? AND mails.id = ?")
|
||||
if err != nil {
|
||||
@ -1,4 +1,4 @@
|
||||
package main
|
||||
package web_server
|
||||
|
||||
templ styles() {
|
||||
<style>
|
||||
@ -3,12 +3,12 @@
|
||||
pid=0
|
||||
|
||||
get_ts() {
|
||||
stat cmd/web_server pkg/** | grep Modify | awk '{$1=""; print $0}' | sed 's/^ //g' | sort -r | head -1
|
||||
stat pkg/** | grep Modify | awk '{$1=""; print $0}' | sed 's/^ //g' | sort -r | head -1
|
||||
}
|
||||
|
||||
run_server() {
|
||||
make -B web
|
||||
./bin/web_server &
|
||||
make -B
|
||||
./bin/server &
|
||||
pid=$!
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user