Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 09:37:02 +00:00
Code Issues Releases Wiki Activity

config: lowercase log levels for #90

Browse Source
This commit is contained in:
James Hillyerd
2018-04-01 20:50:18 -07:00
parent d1dbcf6e63
commit 8c66a24513
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -6,7 +6,7 @@ FROM golang:1.10-alpine
# Configuration # Configuration
ENV INBUCKET_SRC $GOPATH/src/github.com/jhillyerd/inbucket ENV INBUCKET_SRC $GOPATH/src/github.com/jhillyerd/inbucket
ENV INBUCKET_HOME /opt/inbucket ENV INBUCKET_HOME /opt/inbucket
ENV INBUCKET_SMTP_DOMAINNOSTORE bitbucket.local ENV INBUCKET_SMTP_DISCARDDOMAINS bitbucket.local
ENV INBUCKET_SMTP_TIMEOUT 30s ENV INBUCKET_SMTP_TIMEOUT 30s
ENV INBUCKET_POP3_TIMEOUT 30s ENV INBUCKET_POP3_TIMEOUT 30s
ENV INBUCKET_WEB_UIDIR $INBUCKET_HOME/ui ENV INBUCKET_WEB_UIDIR $INBUCKET_HOME/ui

13
cmd/inbucket/main.go
View File

@@ -11,7 +11,6 @@ import (
"os" "os"
"os/signal" "os/signal"
"runtime" "runtime"
"strings"
"syscall" "syscall"
"time" "time"
@@ -168,17 +167,17 @@ signalLoop:
// openLog configures zerolog output, returns func to close logfile. // openLog configures zerolog output, returns func to close logfile.
func openLog(level string, logfile string, json bool) (close func(), err error) { func openLog(level string, logfile string, json bool) (close func(), err error) {
switch strings.ToUpper(level) { switch level {
case "DEBUG": case "debug":
zerolog.SetGlobalLevel(zerolog.DebugLevel) zerolog.SetGlobalLevel(zerolog.DebugLevel)
case "INFO": case "info":
zerolog.SetGlobalLevel(zerolog.InfoLevel) zerolog.SetGlobalLevel(zerolog.InfoLevel)
case "WARN": case "warn":
zerolog.SetGlobalLevel(zerolog.WarnLevel) zerolog.SetGlobalLevel(zerolog.WarnLevel)
case "ERROR": case "error":
zerolog.SetGlobalLevel(zerolog.ErrorLevel) zerolog.SetGlobalLevel(zerolog.ErrorLevel)
default: default:
return nil, fmt.Errorf("Log level %q not one of: DEBUG, INFO, WARN, ERROR", level) return nil, fmt.Errorf("Log level %q not one of: debug, info, warn, error", level)
} }
close = func() {} close = func() {}
var w io.Writer var w io.Writer

10
doc/config.md
View File

@@ -8,7 +8,7 @@ Running `inbucket -help` will yield a condensed summary of the environment
variables it supports: variables it supports:
KEY DEFAULT DESCRIPTION KEY DEFAULT DESCRIPTION
INBUCKET_LOGLEVEL INFO DEBUG, INFO, WARN, or ERROR INBUCKET_LOGLEVEL info debug, info, warn, or error
INBUCKET_SMTP_ADDR 0.0.0.0:2500 SMTP server IP4 host:port INBUCKET_SMTP_ADDR 0.0.0.0:2500 SMTP server IP4 host:port
INBUCKET_SMTP_DOMAIN inbucket HELO domain INBUCKET_SMTP_DOMAIN inbucket HELO domain
INBUCKET_SMTP_MAXRECIPIENTS 200 Maximum RCPT TO per message INBUCKET_SMTP_MAXRECIPIENTS 200 Maximum RCPT TO per message
@@ -47,11 +47,11 @@ The following documentation will describe each of these in more detail.
`INBUCKET_LOGLEVEL` `INBUCKET_LOGLEVEL`
This setting controls the verbosity of log output. A small desktop installation This setting controls the verbosity of log output. A small desktop installation
should probably select INFO, but a busy shared installation would be better off should probably select `info`, but a busy shared installation would be better
with WARN or ERROR. off with `warn` or `error`.
- Default: `INFO` - Default: `info`
- Values: one of `DEBUG`, `INFO`, `WARN`, or `ERROR` - Values: one of `debug`, `info`, `warn`, or `error`
## SMTP ## SMTP

4
etc/dev-start.sh
View File

@@ -2,8 +2,8 @@
# dev-start.sh # dev-start.sh
# description: Developer friendly Inbucket configuration # description: Developer friendly Inbucket configuration
export INBUCKET_LOGLEVEL="DEBUG" export INBUCKET_LOGLEVEL="debug"
export INBUCKET_SMTP_DOMAINNOSTORE="bitbucket.local" export INBUCKET_SMTP_DISCARDDOMAINS="bitbucket.local"
export INBUCKET_WEB_TEMPLATECACHE="false" export INBUCKET_WEB_TEMPLATECACHE="false"
export INBUCKET_WEB_COOKIEAUTHKEY="not-secret" export INBUCKET_WEB_COOKIEAUTHKEY="not-secret"
export INBUCKET_STORAGE_TYPE="file" export INBUCKET_STORAGE_TYPE="file"

2
etc/linux/inbucket.service
View File

@@ -8,7 +8,7 @@ User=daemon
Group=daemon Group=daemon
PermissionsStartOnly=true PermissionsStartOnly=true
Environment=INBUCKET_LOGLEVEL=WARN Environment=INBUCKET_LOGLEVEL=warn
Environment=INBUCKET_SMTP_ADDR=0.0.0.0:2500 Environment=INBUCKET_SMTP_ADDR=0.0.0.0:2500
Environment=INBUCKET_POP3_ADDR=0.0.0.0:1100 Environment=INBUCKET_POP3_ADDR=0.0.0.0:1100
Environment=INBUCKET_WEB_ADDR=0.0.0.0:9000 Environment=INBUCKET_WEB_ADDR=0.0.0.0:9000

4
pkg/config/config.go
View File

@@ -3,6 +3,7 @@ package config
import ( import (
"log" "log"
"os" "os"
"strings"
"text/tabwriter" "text/tabwriter"
"time" "time"
@@ -30,7 +31,7 @@ var (
// Root wraps all other configurations. // Root wraps all other configurations.
type Root struct { type Root struct {
LogLevel string `required:"true" default:"INFO" desc:"DEBUG, INFO, WARN, or ERROR"` LogLevel string `required:"true" default:"info" desc:"debug, info, warn, or error"`
SMTP SMTP SMTP SMTP
POP3 POP3 POP3 POP3
Web Web Web Web
@@ -86,6 +87,7 @@ type Storage struct {
func Process() (*Root, error) { func Process() (*Root, error) {
c := &Root{} c := &Root{}
err := envconfig.Process(prefix, c) err := envconfig.Process(prefix, c)
c.LogLevel = strings.ToLower(c.LogLevel)
stringutil.SliceToLower(c.SMTP.AcceptDomains) stringutil.SliceToLower(c.SMTP.AcceptDomains)
stringutil.SliceToLower(c.SMTP.RejectDomains) stringutil.SliceToLower(c.SMTP.RejectDomains)
stringutil.SliceToLower(c.SMTP.StoreDomains) stringutil.SliceToLower(c.SMTP.StoreDomains)