logging level flag

KostyaEsmukov · Dec 13, 2022 · f9ede9e · f9ede9e
1 parent 2f1167e
commit f9ede9e
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 8 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -0,0 +1,59 @@
+project_name: smtp_to_telegram
+
+release:
+  prerelease: auto
+
+builds:
+  - id: smtp_to_telegram
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - windows
+      - darwin
+      - linux
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - '7'
+    ldflags:
+      - -s -w -X main.Version={{.Version}}
+    tags:
+      - urfave_cli_no_docs
+
+snapshot:
+  name_template: "{{ .Tag }}-next"
+
+dockers:
+  - &xdocker
+    image_templates:
+      - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: amd64
+    build_flag_templates:
+      - --platform=linux/amd64
+
+  - <<: *xdocker
+    image_templates:
+      - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
+    goarch: arm64
+    build_flag_templates:
+      - --platform=linux/arm64/v8
+
+  - <<: *xdocker
+    image_templates:
+      - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
+    goarch: arm
+    goarm: 7
+    build_flag_templates:
+      - --platform=linux/arm/v7
+
+docker_manifests:
+  - name_template: fopina/{{ .ProjectName }}:latest
+    image_templates:
+    - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ ARG GOPROXY=direct
 RUN CGO_ENABLED=0 GOOS=linux go build \
         -ldflags "-s -w \
             -X main.Version=${ST_VERSION:-UNKNOWN_RELEASE}" \
+        -tags urfave_cli_no_docs \
         -a -o smtp_to_telegram
 
 

diff --git a/smtp_to_telegram.go b/smtp_to_telegram.go
@@ -5,13 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	units "github.com/docker/go-units"
-	"github.com/flashmob/go-guerrilla"
-	"github.com/flashmob/go-guerrilla/backends"
-	"github.com/flashmob/go-guerrilla/log"
-	"github.com/flashmob/go-guerrilla/mail"
-	"github.com/jhillyerd/enmime"
-	"github.com/urfave/cli/v2"
 	"io/ioutil"
 	"mime"
 	"mime/multipart"
@@ -23,6 +16,14 @@ import (
 	"strings"
 	"syscall"
 	"time"
+
+	units "github.com/docker/go-units"
+	"github.com/flashmob/go-guerrilla"
+	"github.com/flashmob/go-guerrilla/backends"
+	"github.com/flashmob/go-guerrilla/log"
+	"github.com/flashmob/go-guerrilla/mail"
+	"github.com/jhillyerd/enmime"
+	"github.com/urfave/cli/v2"
 )
 
 var (
@@ -38,6 +39,7 @@ type SmtpConfig struct {
 	smtpListen          string
 	smtpPrimaryHost     string
 	smtpMaxEnvelopeSize int64
+	logLevel            string
 }
 
 type TelegramConfig struct {
@@ -103,6 +105,7 @@ func main() {
 			smtpListen:          c.String("smtp-listen"),
 			smtpPrimaryHost:     c.String("smtp-primary-host"),
 			smtpMaxEnvelopeSize: smtpMaxEnvelopeSize,
+			logLevel:            c.String("log-level"),
 		}
 		forwardedAttachmentMaxSize, err := units.FromHumanSize(c.String("forwarded-attachment-max-size"))
 		if err != nil {
@@ -213,6 +216,12 @@ func main() {
 			Value:   4095,
 			EnvVars: []string{"ST_MESSAGE_LENGTH_TO_SEND_AS_FILE"},
 		},
+		&cli.StringFlag{
+			Name:    "log-level",
+			Usage:   "Logging level (info, debug, error, panic).",
+			Value:   "info",
+			EnvVars: []string{"ST_LOG_LEVEL"},
+		},
 	}
 	err := app.Run(os.Args)
 	if err != nil {
@@ -224,7 +233,7 @@ func main() {
 func SmtpStart(
 	smtpConfig *SmtpConfig, telegramConfig *TelegramConfig) (guerrilla.Daemon, error) {
 
-	cfg := &guerrilla.AppConfig{LogFile: log.OutputStdout.String()}
+	cfg := &guerrilla.AppConfig{LogFile: log.OutputStdout.String(), LogLevel: smtpConfig.logLevel}
 
 	cfg.AllowedHosts = []string{"."}