modules/setting: simple behave change in startup
This commit is contained in:
		
					parent
					
						
							
								8896c82d34
							
						
					
				
			
			
				commit
				
					
						e3dece1371
					
				
			
		
					 4 changed files with 7 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
[run]
 | 
			
		||||
init_cmds = [
 | 
			
		||||
	["grep", "-rn", "FIXME", "."],
 | 
			
		||||
	#["grep", "-rn", "FIXME", "."],
 | 
			
		||||
	["./gogs", "web"]
 | 
			
		||||
]
 | 
			
		||||
watch_all = true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -164,7 +164,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
 | 
			
		|||
	},
 | 
			
		||||
	"DiffTypeToStr":     DiffTypeToStr,
 | 
			
		||||
	"DiffLineTypeToStr": DiffLineTypeToStr,
 | 
			
		||||
	"Sha1":	             Sha1,
 | 
			
		||||
	"Sha1":              Sha1,
 | 
			
		||||
	"ShortSha":          ShortSha,
 | 
			
		||||
	"Md5":               EncodeMd5,
 | 
			
		||||
	"ActionContent2Commits": ActionContent2Commits,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -272,10 +272,6 @@ func NewConfigContext() {
 | 
			
		|||
		"StampNano":   time.StampNano,
 | 
			
		||||
	}[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")]
 | 
			
		||||
 | 
			
		||||
	if err = os.MkdirAll(AttachmentPath, os.ModePerm); err != nil {
 | 
			
		||||
		log.Fatal(4, "Could not create directory %s: %s", AttachmentPath, err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	RunUser = Cfg.Section("").Key("RUN_USER").String()
 | 
			
		||||
	curUser := os.Getenv("USER")
 | 
			
		||||
	if len(curUser) == 0 {
 | 
			
		||||
| 
						 | 
				
			
			@ -298,9 +294,6 @@ func NewConfigContext() {
 | 
			
		|||
	} else {
 | 
			
		||||
		RepoRootPath = filepath.Clean(RepoRootPath)
 | 
			
		||||
	}
 | 
			
		||||
	if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil {
 | 
			
		||||
		log.Fatal(4, "Fail to create repository root path(%s): %v", RepoRootPath, err)
 | 
			
		||||
	}
 | 
			
		||||
	ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash")
 | 
			
		||||
 | 
			
		||||
	sec = Cfg.Section("picture")
 | 
			
		||||
| 
						 | 
				
			
			@ -309,7 +302,6 @@ func NewConfigContext() {
 | 
			
		|||
	if !filepath.IsAbs(AvatarUploadPath) {
 | 
			
		||||
		AvatarUploadPath = path.Join(workDir, AvatarUploadPath)
 | 
			
		||||
	}
 | 
			
		||||
	os.MkdirAll(AvatarUploadPath, os.ModePerm)
 | 
			
		||||
	switch sec.Key("GRAVATAR_SOURCE").MustString("gravatar") {
 | 
			
		||||
	case "duoshuo":
 | 
			
		||||
		GravatarSource = "http://gravatar.duoshuo.com/avatar/"
 | 
			
		||||
| 
						 | 
				
			
			@ -374,9 +366,11 @@ func newLogService() {
 | 
			
		|||
			log.Fatal(4, "Unknown log mode: %s", mode)
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		validLevels := []string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"}
 | 
			
		||||
		// Log level.
 | 
			
		||||
		levelName := Cfg.Section("log."+mode).Key("LEVEL").In("Trace",
 | 
			
		||||
			[]string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"})
 | 
			
		||||
		levelName := Cfg.Section("log."+mode).Key("LEVEL").In(
 | 
			
		||||
			Cfg.Section("log").Key("LEVEL").In("Trace", validLevels),
 | 
			
		||||
			validLevels)
 | 
			
		||||
		level, ok := logLevels[levelName]
 | 
			
		||||
		if !ok {
 | 
			
		||||
			log.Fatal(4, "Unknown log level: %s", levelName)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -224,6 +224,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
 | 
			
		|||
	cfg.Section("session").Key("PROVIDER").SetValue("file")
 | 
			
		||||
 | 
			
		||||
	cfg.Section("log").Key("MODE").SetValue("file")
 | 
			
		||||
	cfg.Section("log").Key("LEVEL").SetValue("Info")
 | 
			
		||||
 | 
			
		||||
	cfg.Section("security").Key("INSTALL_LOCK").SetValue("true")
 | 
			
		||||
	cfg.Section("security").Key("SECRET_KEY").SetValue(base.GetRandomString(15))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue