fix

Author: Voldemat

emails/server.go

@@ -90,7 +90,7 @@ func (s *Session) Logout() error {
 
 func CreateSMTPServer(
 	host string,
-	port string,
+	port int,
 	username string,
 	password string,
 	queueSizeString string,
@@ -105,7 +105,7 @@ func CreateSMTPServer(
 		Emails:   make(chan Email, queueSize),
 	}
 	s := smtp.NewServer(be)
-	s.Addr = host + ":" + port
+	s.Addr = host + ":" + strconv.Itoa(port)
 	s.Domain = host
 	s.WriteTimeout = 10 * time.Second
 	s.ReadTimeout = 10 * time.Second

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"log"
 	"os"
+	"strconv"
 	"sync"
 
 	"github.com/Voldemat/go-smtp-mock/server"
@@ -17,8 +18,12 @@ func main() {
 	if smtpHost == "" {
 		log.Fatal("SMTP_HOST is not defined")
 	}
-	smtpPort := os.Getenv("SMTP_PORT")
-	if smtpPort == "" {
+	smtpPortString := os.Getenv("SMTP_PORT")
+	if smtpPortString == "" {
+		log.Fatal("SMTP_PORT is not defined")
+	}
+	smtpPort, err := strconv.ParseInt(smtpPortString, 10, 64)
+	if err != nil {
 		log.Fatal("SMTP_PORT is not defined")
 	}
 	smtpUser := os.Getenv("SMTP_USER")
@@ -29,18 +34,27 @@ func main() {
 	if smtpPassword == "" {
 		log.Fatal("SMTP_PASSWORD is not defined")
 	}
+	httpPortString := os.Getenv("SMTP_HTTP_PORT")
+	if httpPortString == "" {
+		log.Fatal("SMTP_HTTP_PORT is not defined")
+	}
+	httpPort, err := strconv.ParseInt(httpPortString, 10, 64)
+	if err != nil {
+		log.Fatal("SMTP_HTTP_PORT is not defined")
+	}
 	var wg sync.WaitGroup
 	wg.Add(2)
 
-	server.CreateServerRoutines(
-        &wg,
-        queueSize,
-        smtpHost,
-        smtpPort,
-        smtpUser,
-        smtpPassword,
-        os.Getenv("HTTP_HOST"),
-        os.Getenv("HTTP_PORT"),
-    )
-    wg.Wait()
+	server.CreateServerRoutines(server.CreateServerRoutinesArgs{
+		Wg:           &wg,
+		SmtpHost:     smtpHost,
+		SmtpPort:     int(smtpPort),
+		SmtpUser:     smtpUser,
+		SmtpPassword: smtpPassword,
+		HttpHost:     os.Getenv("HTTP_HOST"),
+		HttpPort:     int(httpPort),
+		QueueSize:    queueSize,
+	},
+	)
+	wg.Wait()
 }

server/server.go

@@ -3,42 +3,45 @@ package server
 import (
 	"log"
 	"net/http"
+	"strconv"
 	"sync"
 
 	"github.com/Voldemat/go-smtp-mock/emails"
 )
 
+type CreateServerRoutinesArgs struct {
+    Wg *sync.WaitGroup
+    SmtpHost string
+    SmtpPort int
+    SmtpUser string
+    SmtpPassword string
+    HttpHost string
+    HttpPort int
+    QueueSize string
+}
+
 func CreateServerRoutines(
-    wg *sync.WaitGroup,
-    smtpHost string,
-    smtpUser string,
-    smtpPort string,
-    smtpPassword string,
-    queueSize string,
-    httpHost string,
-    httpPort string,
+    args CreateServerRoutinesArgs,
 ) *emails.Backend {
     backend, server := emails.CreateSMTPServer(
-        smtpHost,
-        smtpPort,
-        smtpUser,
-        smtpPassword,
-        queueSize,
+        args.SmtpHost,
+        args.SmtpPort,
+        args.SmtpUser,
+        args.SmtpPassword,
+        args.QueueSize,
     )
     mux := CreateHTTPServer(backend)
-
-	wg.Add(2)
-
+	args.Wg.Add(2)
 	go func() {
-		defer wg.Done()
+		defer args.Wg.Done()
         http.ListenAndServe(
-            httpHost + ":" + httpPort,
+            args.HttpHost + ":" + strconv.Itoa(args.HttpPort),
             mux,
         )
 	}()
 
 	go func() {
-		defer wg.Done()
+		defer args.Wg.Done()
         err := server.ListenAndServe()
         if err != nil {
             log.Fatal(err)