Merge branch 'master' of localhost:xiaoxiao/gogs6

Conflicts:
	.gitignore

2 files changed, 3 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 2248ed1998..a16d7156fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+
 gogs
 *.exe
 *.exe~
diff --git a/serve.go b/serve.go
index 8d9fd69cda..6add5a9bd8 100644
--- a/serve.go
+++ b/serve.go
@@ -46,8 +46,9 @@ gogs serv provide access auth for repositories`,
 }
 
 func init() {
+	level := "0"
 	os.MkdirAll("log", os.ModePerm)
-	log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
+	log.NewLogger(10000, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, "log/serv.log"))
 	log.Info("start logging...")
 }