vitalif
/
gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setting: check mailService.From only if it has value (#4134)

master
Unknwon 2017-02-17 12:28:23 -05:00
parent 57cb23ac81
commit ba93504804
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/tool.go
View File

@ -182,11 +182,11 @@ func HashEmail(email string) string {
// to return full URL if user enables Gravatar-like service. // to return full URL if user enables Gravatar-like service.
func AvatarLink(email string) (url string) { func AvatarLink(email string) (url string) {
if setting.EnableFederatedAvatar && setting.LibravatarService != nil && if setting.EnableFederatedAvatar && setting.LibravatarService != nil &&
len(email) > 0 { strings.Contains(email, "@") {
var err error var err error
url, err = setting.LibravatarService.FromEmail(email) url, err = setting.LibravatarService.FromEmail(email)
if err != nil { if err != nil {
log.Error(3, "LibravatarService.FromEmail [%s]: %v", email, err) log.Error(2, "LibravatarService.FromEmail [%s]: %v", email, err)
} }
} }
if len(url) == 0 && !setting.DisableGravatar { if len(url) == 0 && !setting.DisableGravatar {

56
modules/setting/setting.go
View File

@ -302,7 +302,7 @@ func init() {
var err error var err error
if AppPath, err = execPath(); err != nil { if AppPath, err = execPath(); err != nil {
log.Fatal(4, "Fail to get app path: %v\n", err) log.Fatal(2, "Fail to get app path: %v\n", err)
} }
// Note: we don't use path.Dir here because it does not handle case // Note: we don't use path.Dir here because it does not handle case
@ -326,7 +326,7 @@ func WorkDir() (string, error) {
func forcePathSeparator(path string) { func forcePathSeparator(path string) {
if strings.Contains(path, "\\") { if strings.Contains(path, "\\") {
log.Fatal(4, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places") log.Fatal(2, "Do not use '\\' or '\\\\' in paths, instead, please use '/' in all places")
} }
} }
@ -348,12 +348,12 @@ func IsRunUserMatchCurrentUser(runUser string) (string, bool) {
func NewContext() { func NewContext() {
workDir, err := WorkDir() workDir, err := WorkDir()
if err != nil { if err != nil {
log.Fatal(4, "Fail to get work directory: %v", err) log.Fatal(2, "Fail to get work directory: %v", err)
} }
Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini")) Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini"))
if err != nil { if err != nil {
log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) log.Fatal(2, "Fail to parse 'conf/app.ini': %v", err)
} }
CustomPath = os.Getenv("GOGS_CUSTOM") CustomPath = os.Getenv("GOGS_CUSTOM")
@ -367,7 +367,7 @@ func NewContext() {
if com.IsFile(CustomConf) { if com.IsFile(CustomConf) {
if err = Cfg.Append(CustomConf); err != nil { if err = Cfg.Append(CustomConf); err != nil {
log.Fatal(4, "Fail to load custom conf '%s': %v", CustomConf, err) log.Fatal(2, "Fail to load custom conf '%s': %v", CustomConf, err)
} }
} else { } else {
log.Warn("Custom config '%s' not found, ignore this if you're running first time", CustomConf) log.Warn("Custom config '%s' not found, ignore this if you're running first time", CustomConf)
@ -376,7 +376,7 @@ func NewContext() {
homeDir, err := com.HomeDir() homeDir, err := com.HomeDir()
if err != nil { if err != nil {
log.Fatal(4, "Fail to get home directory: %v", err) log.Fatal(2, "Fail to get home directory: %v", err)
} }
homeDir = strings.Replace(homeDir, "\\", "/", -1) homeDir = strings.Replace(homeDir, "\\", "/", -1)
@ -393,7 +393,7 @@ func NewContext() {
// Check if has app suburl. // Check if has app suburl.
url, err := url.Parse(AppUrl) url, err := url.Parse(AppUrl)
if err != nil { if err != nil {
log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err) log.Fatal(2, "Invalid ROOT_URL '%s': %s", AppUrl, err)
} }
// Suburl should start with '/' and end without '/', such as '/{subpath}'. // Suburl should start with '/' and end without '/', such as '/{subpath}'.
// This value is empty if site does not have sub-url. // This value is empty if site does not have sub-url.
@ -412,7 +412,7 @@ func NewContext() {
UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666") UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666")
UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32) UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32)
if err != nil || UnixSocketPermissionParsed > 0777 { if err != nil || UnixSocketPermissionParsed > 0777 {
log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw) log.Fatal(2, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
} }
UnixSocketPermission = uint32(UnixSocketPermissionParsed) UnixSocketPermission = uint32(UnixSocketPermissionParsed)
} }
@ -437,7 +437,7 @@ func NewContext() {
SSH.ServerCiphers = sec.Key("SSH_SERVER_CIPHERS").Strings(",") SSH.ServerCiphers = sec.Key("SSH_SERVER_CIPHERS").Strings(",")
SSH.KeyTestPath = os.TempDir() SSH.KeyTestPath = os.TempDir()
if err = Cfg.Section("server").MapTo(&SSH); err != nil { if err = Cfg.Section("server").MapTo(&SSH); err != nil {
log.Fatal(4, "Fail to map SSH settings: %v", err) log.Fatal(2, "Fail to map SSH settings: %v", err)
} }
// When disable SSH, start builtin server value is ignored. // When disable SSH, start builtin server value is ignored.
if SSH.Disabled { if SSH.Disabled {
@ -446,9 +446,9 @@ func NewContext() {
if !SSH.Disabled && !SSH.StartBuiltinServer { if !SSH.Disabled && !SSH.StartBuiltinServer {
if err := os.MkdirAll(SSH.RootPath, 0700); err != nil { if err := os.MkdirAll(SSH.RootPath, 0700); err != nil {
log.Fatal(4, "Fail to create '%s': %v", SSH.RootPath, err) log.Fatal(2, "Fail to create '%s': %v", SSH.RootPath, err)
} else if err = os.MkdirAll(SSH.KeyTestPath, 0644); err != nil { } else if err = os.MkdirAll(SSH.KeyTestPath, 0644); err != nil {
log.Fatal(4, "Fail to create '%s': %v", SSH.KeyTestPath, err) log.Fatal(2, "Fail to create '%s': %v", SSH.KeyTestPath, err)
} }
} }
@ -503,7 +503,7 @@ func NewContext() {
if InstallLock { if InstallLock {
currentUser, match := IsRunUserMatchCurrentUser(RunUser) currentUser, match := IsRunUserMatchCurrentUser(RunUser)
if !match { if !match {
log.Fatal(4, "Expect user '%s' but current user is: %s", RunUser, currentUser) log.Fatal(2, "Expect user '%s' but current user is: %s", RunUser, currentUser)
} }
} }
@ -520,11 +520,11 @@ func NewContext() {
} }
ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash") ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash")
if err = Cfg.Section("repository").MapTo(&Repository); err != nil { if err = Cfg.Section("repository").MapTo(&Repository); err != nil {
log.Fatal(4, "Fail to map Repository settings: %v", err) log.Fatal(2, "Fail to map Repository settings: %v", err)
} else if err = Cfg.Section("repository.editor").MapTo(&Repository.Editor); err != nil { } else if err = Cfg.Section("repository.editor").MapTo(&Repository.Editor); err != nil {
log.Fatal(4, "Fail to map Repository.Editor settings: %v", err) log.Fatal(2, "Fail to map Repository.Editor settings: %v", err)
} else if err = Cfg.Section("repository.upload").MapTo(&Repository.Upload); err != nil { } else if err = Cfg.Section("repository.upload").MapTo(&Repository.Upload); err != nil {
log.Fatal(4, "Fail to map Repository.Upload settings: %v", err) log.Fatal(2, "Fail to map Repository.Upload settings: %v", err)
} }
if !filepath.IsAbs(Repository.Upload.TempPath) { if !filepath.IsAbs(Repository.Upload.TempPath) {
@ -572,21 +572,21 @@ func NewContext() {
} }
if err = Cfg.Section("http").MapTo(&HTTP); err != nil { if err = Cfg.Section("http").MapTo(&HTTP); err != nil {
log.Fatal(4, "Fail to map HTTP settings: %v", err) log.Fatal(2, "Fail to map HTTP settings: %v", err)
} else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil { } else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil {
log.Fatal(4, "Fail to map Markdown settings: %v", err) log.Fatal(2, "Fail to map Markdown settings: %v", err)
} else if err = Cfg.Section("admin").MapTo(&Admin); err != nil { } else if err = Cfg.Section("admin").MapTo(&Admin); err != nil {
log.Fatal(4, "Fail to map Admin settings: %v", err) log.Fatal(2, "Fail to map Admin settings: %v", err)
} else if err = Cfg.Section("cron").MapTo(&Cron); err != nil { } else if err = Cfg.Section("cron").MapTo(&Cron); err != nil {
log.Fatal(4, "Fail to map Cron settings: %v", err) log.Fatal(2, "Fail to map Cron settings: %v", err)
} else if err = Cfg.Section("git").MapTo(&Git); err != nil { } else if err = Cfg.Section("git").MapTo(&Git); err != nil {
log.Fatal(4, "Fail to map Git settings: %v", err) log.Fatal(2, "Fail to map Git settings: %v", err)
} else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil { } else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil {
log.Fatal(4, "Fail to map Mirror settings: %v", err) log.Fatal(2, "Fail to map Mirror settings: %v", err)
} else if err = Cfg.Section("api").MapTo(&API); err != nil { } else if err = Cfg.Section("api").MapTo(&API); err != nil {
log.Fatal(4, "Fail to map API settings: %v", err) log.Fatal(2, "Fail to map API settings: %v", err)
} else if err = Cfg.Section("ui").MapTo(&UI); err != nil { } else if err = Cfg.Section("ui").MapTo(&UI); err != nil {
log.Fatal(4, "Fail to map UI settings: %v", err) log.Fatal(2, "Fail to map UI settings: %v", err)
} }
if Mirror.DefaultInterval <= 0 { if Mirror.DefaultInterval <= 0 {
@ -653,7 +653,7 @@ func newLogService() {
mode = strings.ToLower(strings.TrimSpace(mode)) mode = strings.ToLower(strings.TrimSpace(mode))
sec, err := Cfg.GetSection("log." + mode) sec, err := Cfg.GetSection("log." + mode)
if err != nil { if err != nil {
log.Fatal(4, "Unknown logger mode: %s", mode) log.Fatal(2, "Unknown logger mode: %s", mode)
} }
validLevels := []string{"trace", "info", "warn", "error", "fatal"} validLevels := []string{"trace", "info", "warn", "error", "fatal"}
@ -678,7 +678,7 @@ func newLogService() {
case log.FILE: case log.FILE:
logPath := path.Join(LogRootPath, "gogs.log") logPath := path.Join(LogRootPath, "gogs.log")
if err = os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil { if err = os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil {
log.Fatal(4, "Fail to create log directory '%s': %v", path.Dir(logPath), err) log.Fatal(2, "Fail to create log directory '%s': %v", path.Dir(logPath), err)
} }
LogConfigs[i] = log.FileConfig{ LogConfigs[i] = log.FileConfig{
@ -721,7 +721,7 @@ func newCacheService() {
case "redis", "memcache": case "redis", "memcache":
CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ") CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ")
default: default:
log.Fatal(4, "Unknown cache adapter: %s", CacheAdapter) log.Fatal(2, "Unknown cache adapter: %s", CacheAdapter)
} }
log.Info("Cache Service Enabled") log.Info("Cache Service Enabled")
@ -783,11 +783,13 @@ func newMailService() {
} }
MailService.From = sec.Key("FROM").MustString(MailService.User) MailService.From = sec.Key("FROM").MustString(MailService.User)
if len(MailService.From) > 0 {
parsed, err := mail.ParseAddress(MailService.From) parsed, err := mail.ParseAddress(MailService.From)
if err != nil { if err != nil {
log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err) log.Fatal(2, "Invalid mailer.FROM (%s): %v", MailService.From, err)
} }
MailService.FromEmail = parsed.Address MailService.FromEmail = parsed.Address
}
log.Info("Mail Service Enabled") log.Info("Mail Service Enabled")
} }