Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

fix custom port from env

Jonas Kaninda1af2905424e6
diff --git a/cmd/posta/main.go b/cmd/posta/main.go
index b60f993..9eafa83 100644
--- a/cmd/posta/main.go
+++ b/cmd/posta/main.go
@@ -30,26 +30,18 @@ import (
"github.com/jkaninda/okapi/okapicli"
)
-type ServerConfig struct {
- Port int `cli:"port" short:"p" desc:"HTTP server port" env:"POSTA_PORT" default:"9000"`
- Debug bool `cli:"debug" short:"d" desc:"Enable debug mode" env:"POSTA_DEV_MODE" default:"false"`
-}
-
func main() {
app := okapi.New()
cli := okapicli.New(app, "Posta")
- serveCfg := &ServerConfig{}
cli.Command("server", "Start Posta server", func(cmd *okapicli.Command) error {
- app.WithPort(serveCfg.Port)
- if serveCfg.Debug {
- app.WithDebug()
- }
+ logger.Info("Starting Posta Server...")
runServer(cli)
return nil
- }).FromStruct(serveCfg)
+ })
cli.Command("worker", "Start Posta worker", func(cmd *okapicli.Command) error {
+ logger.Info("Starting Posta Worker...")
if err := runWorker(); err != nil {
logger.Fatal("worker server error", "error", err)
}
diff --git a/cmd/posta/server.go b/cmd/posta/server.go
index 6b43ed6..f0b2e55 100644
--- a/cmd/posta/server.go
+++ b/cmd/posta/server.go
@@ -61,9 +61,7 @@ func runServer(cli *okapicli.CLI) {
if err := cfg.Initialize(app); err != nil {
logger.Fatal("Failed to initialize Posta", "error", err)
}
-
res := &serverResources{}
-
if err := cli.RunServer(&okapicli.RunOptions{
ShutdownTimeout: 30 * time.Second,
OnStart: func() {
@@ -105,7 +103,7 @@ func runServer(cli *okapicli.CLI) {
}
},
OnStarted: func() {
- logger.Info("Posta Server started", "version", config.Version, "port", cli.GetInt("port"))
+ logger.Info("Posta Server started", "version", config.Version, "port", cfg.Port)
},
OnShutdown: func() {
shutdownServer(res)
diff --git a/internal/config/config.go b/internal/config/config.go
index 75d879f..822dd3e 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -43,6 +43,7 @@ type Config struct {
Redis RedisConfig
JWTSecret string
Env string
+ Port int
DevMode bool
RateLimitHourly int
RateLimitDaily int
@@ -106,6 +107,7 @@ func New() *Config {
Addr: goutils.Env("POSTA_REDIS_ADDR", "localhost:6379"),
Password: goutils.Env("POSTA_REDIS_PASSWORD", ""),
},
+ Port: goutils.EnvInt("POSTA_PORT", 9000),
Env: goutils.Env("POSTA_ENV", "dev"),
JWTSecret: goutils.Env("POSTA_JWT_SECRET", "change-me-in-production"),
DevMode: goutils.EnvBool("POSTA_DEV_MODE", false),
@@ -142,6 +144,12 @@ func (c *Config) Initialize(app *okapi.Okapi) error {
}
// Initialize global logger
l := c.initLogger()
+ // Dev mode
+ if c.DevMode {
+ app.WithDebug()
+ }
+ // Set Port
+ app.WithPort(c.Port)
app.WithLogger(l.Logger)
_ = goutils.SetEnv("ENV", c.Env)
corsOrigins := strings.Split(c.CORSOrigins, ",")
@@ -158,6 +166,9 @@ func (c *Config) Initialize(app *okapi.Okapi) error {
app.WithOpenAPIDocs(okapi.OpenAPI{
Title: "Posta API",
Version: "v1",
+ License: okapi.License{
+ Name: "MIT",
+ },
})
}
app.WithErrorHandler(errorhandlers.CustomErrorHandler())