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

Merge branch 'dev' of github.com:gogits/gogs into dev

Browse Source
This commit is contained in:
Unknown 2014-04-26 00:21:52 -06:00
commit 861a20f464
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/conf.go
View File

@ -316,7 +316,7 @@ func NewConfigContext() {
// load LDAP authentication configuration if present // load LDAP authentication configuration if present
LdapAuth = Cfg.MustBool("security", "LDAP_AUTH", false) LdapAuth = Cfg.MustBool("security", "LDAP_AUTH", false)
if LdapAuth { if LdapAuth {
log.Debug("LDAP AUTHENTICATION activated") qlog.Debug("LDAP AUTHENTICATION activated")
nbsrc := 0 nbsrc := 0
for _, v := range Cfg.GetSectionList() { for _, v := range Cfg.GetSectionList() {
if matched, _ := regexp.MatchString("(?i)^LDAPSOURCE.*", v); matched { if matched, _ := regexp.MatchString("(?i)^LDAPSOURCE.*", v); matched {
@ -329,15 +329,15 @@ func NewConfigContext() {
ldapmsadsaformat := Cfg.MustValue(v, "MSADSAFORMAT", "%s") ldapmsadsaformat := Cfg.MustValue(v, "MSADSAFORMAT", "%s")
ldap.AddSource(ldapname, ldaphost, ldapport, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat) ldap.AddSource(ldapname, ldaphost, ldapport, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat)
nbsrc += 1 nbsrc += 1
log.Debug("%s added as LDAP source", ldapname) qlog.Debug("%s added as LDAP source", ldapname)
} }
} }
if nbsrc == 0 { if nbsrc == 0 {
log.Debug("No valide LDAP found, LDAP AUTHENTICATION NOT activated") qlog.Debug("No valide LDAP found, LDAP AUTHENTICATION NOT activated")
LdapAuth = false LdapAuth = false
} }
} else { } else {
log.Debug("LDAP AUTHENTICATION NOT activated") qlog.Debug("LDAP AUTHENTICATION NOT activated")
} }
PictureService = Cfg.MustValue("picture", "SERVICE") PictureService = Cfg.MustValue("picture", "SERVICE")

1
serve.go
View File

@ -53,6 +53,7 @@ func newLogger(execDir string) {
} }
qlog.SetOutput(f) qlog.SetOutput(f)
//qlog.SetOutputLevel(qlog.Ldebug)
qlog.Info("Start logging serv...") qlog.Info("Start logging serv...")
} }