From b626050b5faffc84b949a6e10585902862e07f14 Mon Sep 17 00:00:00 2001 From: Mitchell Gerber Date: Tue, 6 Feb 2018 15:00:31 +0000 Subject: [PATCH] minor updates --- Gopkg.lock | 4 ++-- Gopkg.toml | 12 ++++++++++++ db/db.go | 3 +-- main.go | 4 ---- readme.md | 8 ++++++-- webserver/webserver.go | 7 ++++--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 3f374bb..0bc309b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -79,7 +79,7 @@ "unix", "windows" ] - revision = "8f27ce8a604014414f8dfffc25cbcde83a3f2216" + revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd" [[projects]] name = "gopkg.in/go-playground/validator.v8" @@ -96,6 +96,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "466f07b37f7df05f3425d1710259c615b219c5ebb3bd49dfaa4a1d5520a3804c" + inputs-digest = "9f37329612da4c0d5506ae252d26615db7c9e6cbe5c05a7ced8868957d1ef5b7" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 9d9fcee..5e8e436 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -25,10 +25,22 @@ # unused-packages = true +[[constraint]] + name = "github.com/asdine/storm" + version = "2.0.2" + +[[constraint]] + name = "github.com/gin-gonic/gin" + version = "1.2.0" + [[constraint]] branch = "master" name = "github.com/mhale/smtpd" +[[constraint]] + name = "github.com/sirupsen/logrus" + version = "1.0.4" + [prune] go-tests = true unused-packages = true diff --git a/db/db.go b/db/db.go index 329f2ed..7bc2eea 100644 --- a/db/db.go +++ b/db/db.go @@ -1,9 +1,8 @@ package db import ( - "log" - "github.com/asdine/storm" + log "github.com/sirupsen/logrus" ) var Conn *storm.DB diff --git a/main.go b/main.go index c65aa0d..2cce3e8 100644 --- a/main.go +++ b/main.go @@ -3,16 +3,12 @@ package main import ( "os" - "github.com/asdine/storm" "github.com/mgerb/tmail/db" "github.com/mgerb/tmail/smtpserver" "github.com/mgerb/tmail/webserver" log "github.com/sirupsen/logrus" ) -//DB - database instance -var DB *storm.DB - func init() { // Log as JSON instead of the default ASCII formatter. log.SetFormatter(&log.JSONFormatter{}) diff --git a/readme.md b/readme.md index 91b93c4..a1fc934 100644 --- a/readme.md +++ b/readme.md @@ -1,8 +1,12 @@ # TMail -A throwaway smtp mail server. +A throwaway smtp mail server with an API to retrieve emails. +- set up an MX record on your domain. +- point it at your server +- start tmail +- all emails sent to *@ are stored in `mail.db` +- hit these end points to check the email -## Check email ``` All mail: http://host:8090/api/mail diff --git a/webserver/webserver.go b/webserver/webserver.go index 9efca7c..5f58985 100644 --- a/webserver/webserver.go +++ b/webserver/webserver.go @@ -1,11 +1,11 @@ package webserver import ( - "log" - "github.com/gin-gonic/gin" "github.com/mgerb/tmail/db" "github.com/mgerb/tmail/mail" + + log "github.com/sirupsen/logrus" ) func Start() { @@ -18,7 +18,8 @@ func mailHander(c *gin.Context) { to := c.Query("to") var mail []mail.Mail - log.Println(to) + + log.Debug(to) if to != "" { db.Conn.Find("To", to, &mail)