mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-31 06:46:07 +02:00
Fix #209
This commit is contained in:
parent
ff690fd976
commit
ab13a29cb5
13 changed files with 71 additions and 59 deletions
|
@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
|
|||
|
||||
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
||||
|
||||
##### Current version: 0.3.6 Alpha
|
||||
##### Current version: 0.4.0 Alpha
|
||||
|
||||
### NOTICES
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
|
|||
|
||||
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
||||
|
||||
##### 当前版本:0.3.6 Alpha
|
||||
##### 当前版本:0.4.0 Alpha
|
||||
|
||||
## 开发目的
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ func In(b string, sl map[string]int) bool {
|
|||
}
|
||||
|
||||
func runServ(k *cli.Context) {
|
||||
setup("log/serv.log")
|
||||
setup(path.Join(setting.LogRootPath, "serv.log"))
|
||||
|
||||
keys := strings.Split(os.Args[2], "-")
|
||||
if len(keys) != 2 {
|
||||
|
|
|
@ -6,12 +6,14 @@ package cmd
|
|||
|
||||
import (
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
qlog "github.com/qiniu/log"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
var CmdUpdate = cli.Command{
|
||||
|
@ -35,7 +37,7 @@ func runUpdate(c *cli.Context) {
|
|||
return
|
||||
}
|
||||
|
||||
setup("log/update.log")
|
||||
setup(path.Join(setting.LogRootPath, "update.log"))
|
||||
|
||||
args := c.Args()
|
||||
if len(args) != 3 {
|
||||
|
|
|
@ -4,4 +4,6 @@ This directory only used for development, and us [go-bindata](https://github.com
|
|||
|
||||
To apply any change in this directory, install [go-bindata](https://github.com/jteeuwen/go-bindata), and then execute following command in root of source directory:
|
||||
|
||||
$ go-bindata -ignore="\\.DS_Store|README.md" -o modules/bin/conf.go -pkg="bin" conf/...
|
||||
```
|
||||
$ go-bindata -ignore="\\.DS_Store|README.md" -o modules/bin/conf.go -pkg="bin" conf/...
|
||||
```
|
|
@ -171,6 +171,7 @@ SERVICE = server
|
|||
DISABLE_GRAVATAR = false
|
||||
|
||||
[log]
|
||||
ROOT_PATH =
|
||||
; Either "console", "file", "conn", "smtp" or "database", default is "console"
|
||||
; Use comma to separate multiple modes, e.g. "console, file"
|
||||
MODE = console
|
||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.3.6.0525 Alpha"
|
||||
const APP_VER = "0.4.0.0528 Alpha"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
|
|
@ -112,8 +112,7 @@ func SetEngine() (err error) {
|
|||
|
||||
// WARNNING: for serv command, MUST remove the output to os.stdout,
|
||||
// so use log file to instead print to stdout.
|
||||
workDir, _ := setting.WorkDir()
|
||||
logPath := workDir + "/log/xorm.log"
|
||||
logPath := path.Join(setting.LogRootPath, "xorm.log")
|
||||
os.MkdirAll(path.Dir(logPath), os.ModePerm)
|
||||
|
||||
f, err := os.Create(logPath)
|
||||
|
|
|
@ -201,52 +201,52 @@ func conf_app_ini() ([]byte, error) {
|
|||
0x71, 0x8d, 0xa7, 0x29, 0xaf, 0xf4, 0xe8, 0x52, 0xe2, 0x07, 0x91, 0x89,
|
||||
0xe5, 0x4e, 0x40, 0x56, 0xfb, 0xb8, 0xcc, 0xbd, 0x71, 0xfa, 0x84, 0x48,
|
||||
0xd5, 0x79, 0xd6, 0xbd, 0xff, 0x85, 0xbb, 0xd3, 0x7f, 0x5b, 0x9f, 0xd0,
|
||||
0x3e, 0x35, 0x93, 0x40, 0xd5, 0x09, 0x35, 0xb3, 0x00, 0xa5, 0x1e, 0x83,
|
||||
0x17, 0x9a, 0xd3, 0xf2, 0xee, 0x7a, 0x32, 0xde, 0xb9, 0xbe, 0x3e, 0x5b,
|
||||
0x4e, 0x13, 0x70, 0x9f, 0x34, 0x0d, 0x49, 0x19, 0xc5, 0xf3, 0xd0, 0x3c,
|
||||
0x4d, 0xa4, 0xa0, 0x14, 0x39, 0xbc, 0x8b, 0xde, 0x38, 0x54, 0x1d, 0x2e,
|
||||
0xd5, 0xb1, 0x03, 0x13, 0xeb, 0x2d, 0xab, 0x9a, 0x50, 0xab, 0xd5, 0xff,
|
||||
0x66, 0x63, 0xbf, 0xd3, 0xd3, 0x77, 0x8d, 0xaf, 0xd4, 0x8a, 0xfb, 0x05,
|
||||
0xa0, 0x27, 0x35, 0x07, 0xfc, 0x6e, 0x39, 0xa7, 0x1f, 0x0e, 0xba, 0x2a,
|
||||
0xfa, 0xfb, 0x21, 0x2c, 0x8c, 0xfe, 0x76, 0x51, 0xc8, 0x82, 0x7e, 0xf4,
|
||||
0x31, 0xfd, 0x62, 0x58, 0xd9, 0x4d, 0x87, 0x25, 0x07, 0xeb, 0xca, 0xbe,
|
||||
0xb1, 0x29, 0xa5, 0x9b, 0x4f, 0xab, 0x4e, 0xeb, 0x35, 0x36, 0x46, 0xf5,
|
||||
0x72, 0x20, 0x23, 0xe8, 0xdb, 0xd5, 0xfa, 0xed, 0xe6, 0xd8, 0xe6, 0x84,
|
||||
0x41, 0x63, 0x97, 0x9c, 0x16, 0x1b, 0xb4, 0xf4, 0x60, 0x52, 0xe7, 0x04,
|
||||
0x6c, 0x97, 0xd3, 0x3a, 0x7e, 0x18, 0x77, 0xa2, 0x17, 0x0e, 0x13, 0xcc,
|
||||
0x8a, 0xa1, 0x20, 0xca, 0x14, 0x16, 0x88, 0x89, 0x8a, 0x15, 0x52, 0xe3,
|
||||
0xf7, 0x73, 0x85, 0x1a, 0x1f, 0x19, 0x40, 0x67, 0x92, 0x06, 0x49, 0xb8,
|
||||
0x69, 0x9d, 0xa8, 0x5f, 0x7c, 0x19, 0xf4, 0x98, 0xb8, 0x03, 0x77, 0xe2,
|
||||
0xf7, 0xfc, 0x46, 0xb4, 0x8f, 0xc2, 0xcf, 0x88, 0xd1, 0x0c, 0x29, 0x6a,
|
||||
0x69, 0x46, 0x73, 0xb0, 0x52, 0xe0, 0x02, 0x03, 0x93, 0x9c, 0x5b, 0x3c,
|
||||
0x0c, 0xdc, 0x00, 0x7c, 0xd4, 0xfb, 0x7d, 0x40, 0x2f, 0x5b, 0x5e, 0x6d,
|
||||
0x02, 0x63, 0x04, 0x62, 0xa4, 0x90, 0x9d, 0x11, 0x5c, 0x62, 0xa6, 0xbf,
|
||||
0xc6, 0xe7, 0xf8, 0x0d, 0x4a, 0x48, 0x98, 0x81, 0x21, 0xfb, 0xe9, 0x27,
|
||||
0x7c, 0x1d, 0x30, 0xc4, 0xf0, 0xe8, 0xdc, 0xf0, 0xf5, 0x9c, 0x3f, 0x20,
|
||||
0x2b, 0x5d, 0x3a, 0x43, 0xf3, 0xcc, 0xf6, 0xc6, 0x04, 0xe9, 0x3c, 0xa5,
|
||||
0x1e, 0x8f, 0xb4, 0x8e, 0xd1, 0x4d, 0xaf, 0xbf, 0xd4, 0x6b, 0x80, 0xf9,
|
||||
0xf2, 0xe3, 0x17, 0x9a, 0xd9, 0x9f, 0x73, 0x81, 0x2a, 0x62, 0x1e, 0x1b,
|
||||
0x48, 0x1c, 0x62, 0x40, 0xb2, 0x3c, 0x8f, 0x79, 0xc2, 0x69, 0xb2, 0x9e,
|
||||
0xd1, 0xc0, 0x9d, 0x42, 0x6c, 0xa2, 0xd8, 0x86, 0xeb, 0xb5, 0x11, 0x66,
|
||||
0xf3, 0x24, 0xd1, 0xf0, 0x80, 0x6c, 0x9f, 0xf9, 0xb3, 0x86, 0x3d, 0xcf,
|
||||
0x98, 0xcb, 0xab, 0x4a, 0x5f, 0x96, 0x79, 0x7a, 0x1c, 0x28, 0xdf, 0x67,
|
||||
0x2b, 0x40, 0x52, 0xa4, 0x9d, 0x70, 0xce, 0xf7, 0x24, 0x74, 0xd7, 0x46,
|
||||
0x41, 0x19, 0x63, 0x08, 0x0d, 0x90, 0x66, 0x46, 0x5e, 0xf3, 0x6d, 0xd0,
|
||||
0xc7, 0x79, 0xc4, 0x61, 0xb1, 0xe1, 0xbd, 0x5a, 0xf0, 0xac, 0xd9, 0x52,
|
||||
0x80, 0x49, 0x82, 0xeb, 0xbe, 0xc6, 0xb5, 0x59, 0x22, 0xaa, 0x90, 0xd1,
|
||||
0x51, 0x4e, 0xe1, 0xb0, 0xcc, 0xc4, 0xe7, 0x32, 0x2f, 0x2c, 0xe3, 0x7c,
|
||||
0x27, 0x26, 0x88, 0xa4, 0xf9, 0xe2, 0x8a, 0x6f, 0x30, 0xb8, 0x6c, 0x76,
|
||||
0x30, 0xf5, 0x9b, 0xe9, 0xe6, 0x2d, 0xca, 0xa4, 0x99, 0x1d, 0x9c, 0x68,
|
||||
0x71, 0x0b, 0xa7, 0xaf, 0x4d, 0xe3, 0xdb, 0x22, 0x0c, 0x44, 0x38, 0xcf,
|
||||
0x70, 0xa1, 0x88, 0x6a, 0xf0, 0xca, 0x41, 0xda, 0xa4, 0xc6, 0x56, 0x63,
|
||||
0x72, 0xff, 0x2a, 0xe1, 0xce, 0x28, 0xbf, 0x3d, 0x99, 0x7f, 0xfb, 0xf4,
|
||||
0x5d, 0x5a, 0x98, 0x53, 0x17, 0x81, 0xfc, 0x17, 0x85, 0x19, 0xbb, 0x23,
|
||||
0x35, 0x39, 0xc1, 0x87, 0xc6, 0x88, 0x57, 0x39, 0xf1, 0x53, 0xeb, 0xe8,
|
||||
0xe7, 0xc6, 0xf3, 0x69, 0xeb, 0xa0, 0x75, 0xbc, 0xf5, 0x7d, 0x4b, 0x76,
|
||||
0xb1, 0x9d, 0x1b, 0xdb, 0xf5, 0x9a, 0xd0, 0x6d, 0xf2, 0xf2, 0x2e, 0x7c,
|
||||
0x4f, 0x4f, 0x99, 0x1b, 0x08, 0x07, 0x2e, 0x1d, 0x37, 0x0d, 0x3a, 0x0c,
|
||||
0x4c, 0x7f, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x4a, 0x16, 0x71,
|
||||
0x21, 0x18, 0x00, 0x00,
|
||||
0x3e, 0x95, 0x0f, 0x27, 0xd5, 0xe4, 0xdb, 0x48, 0x08, 0x55, 0x57, 0xd4,
|
||||
0xcc, 0x08, 0x94, 0x86, 0x0c, 0x76, 0x68, 0x54, 0x4b, 0x39, 0xea, 0x29,
|
||||
0x79, 0x47, 0x94, 0xfa, 0x6c, 0x39, 0x59, 0xc0, 0x95, 0xd2, 0x34, 0x24,
|
||||
0xc5, 0x14, 0xcf, 0x43, 0xf3, 0x4c, 0x91, 0x82, 0x52, 0xe4, 0xf0, 0x34,
|
||||
0x7a, 0xef, 0x50, 0x75, 0xe8, 0x54, 0xc7, 0x0e, 0x4c, 0xdc, 0xb7, 0xac,
|
||||
0x6a, 0x5a, 0xad, 0x56, 0xff, 0x9b, 0x4d, 0xfe, 0x4e, 0x7f, 0xdf, 0x35,
|
||||
0x7e, 0x53, 0x2b, 0xee, 0x17, 0x30, 0x03, 0xa9, 0x39, 0xe0, 0x77, 0xcb,
|
||||
0x39, 0xfd, 0x70, 0xd0, 0x61, 0xd1, 0xdf, 0x0f, 0x61, 0x61, 0xf4, 0xb7,
|
||||
0x8b, 0x42, 0x16, 0xf4, 0xa3, 0x8f, 0x49, 0x18, 0x83, 0xcb, 0x6e, 0x6a,
|
||||
0x2c, 0x39, 0x58, 0x57, 0xf6, 0x8d, 0x4d, 0xe9, 0xdd, 0x7c, 0x5a, 0x75,
|
||||
0x8a, 0xaf, 0xb1, 0x31, 0xaa, 0x97, 0xc3, 0x19, 0x99, 0xa1, 0x5d, 0xad,
|
||||
0xdf, 0x6e, 0x8e, 0x6d, 0x4e, 0x18, 0x34, 0x76, 0xc9, 0x69, 0xb1, 0x41,
|
||||
0x4b, 0x8f, 0x27, 0x75, 0x7e, 0xc0, 0x76, 0x39, 0xb9, 0xe3, 0x87, 0x71,
|
||||
0x2d, 0x7a, 0xed, 0x30, 0x81, 0xad, 0x18, 0x8a, 0xa3, 0x4c, 0x61, 0x81,
|
||||
0x98, 0xa8, 0x58, 0x21, 0x35, 0x7e, 0x3f, 0x57, 0xa8, 0xf7, 0x91, 0x01,
|
||||
0x74, 0x26, 0x69, 0xa8, 0x84, 0xcb, 0xd6, 0x49, 0xfb, 0xc5, 0x97, 0x09,
|
||||
0x00, 0xd3, 0x77, 0xe0, 0x4e, 0xfc, 0x9e, 0xdf, 0x88, 0xfc, 0x51, 0xf8,
|
||||
0x19, 0xf1, 0x9a, 0x21, 0x5d, 0x2d, 0xcd, 0x98, 0x0e, 0x56, 0x0a, 0x5c,
|
||||
0x60, 0x60, 0x92, 0x73, 0x8b, 0x87, 0x81, 0x1b, 0x80, 0x8f, 0x7a, 0xbf,
|
||||
0x0f, 0xe8, 0x95, 0xcb, 0xab, 0x4d, 0x60, 0x8c, 0x40, 0x8c, 0x14, 0x32,
|
||||
0x35, 0x02, 0x4d, 0xcc, 0xf4, 0xd7, 0xf8, 0x1c, 0xbf, 0x41, 0x39, 0x09,
|
||||
0x33, 0x30, 0x64, 0x3f, 0xfd, 0x84, 0xaf, 0x03, 0x86, 0x78, 0x1e, 0x9d,
|
||||
0x1b, 0xbe, 0x9e, 0xf3, 0x07, 0x64, 0xa8, 0x4b, 0x67, 0x68, 0x9e, 0xdc,
|
||||
0xde, 0x98, 0x80, 0x9d, 0xa7, 0xd4, 0xef, 0x91, 0xd6, 0x31, 0x3a, 0xeb,
|
||||
0xf5, 0x97, 0x7a, 0x0d, 0x30, 0x6b, 0x7e, 0xfc, 0x42, 0x33, 0xfb, 0x73,
|
||||
0x2e, 0x50, 0x51, 0xcc, 0xc3, 0x03, 0x89, 0x43, 0x0c, 0x48, 0x96, 0xe7,
|
||||
0x31, 0x4f, 0x38, 0x4d, 0xd9, 0x33, 0x1a, 0xbe, 0x53, 0x88, 0x4d, 0x14,
|
||||
0xdb, 0x70, 0xbd, 0x36, 0xc2, 0x6c, 0x9e, 0x27, 0x1a, 0x1e, 0x90, 0xed,
|
||||
0x33, 0x7f, 0xd6, 0xb0, 0xe7, 0x19, 0x73, 0x79, 0x55, 0xf5, 0xcb, 0x92,
|
||||
0x4f, 0x0f, 0x05, 0xe5, 0x5b, 0x6d, 0x05, 0x48, 0x8a, 0x14, 0x14, 0xce,
|
||||
0xf9, 0x9e, 0xe4, 0xee, 0xda, 0x28, 0x2e, 0x63, 0x0c, 0xa4, 0x01, 0x52,
|
||||
0xce, 0xc8, 0x6b, 0xbe, 0x13, 0xfa, 0x38, 0x8f, 0x38, 0x2c, 0x36, 0xbc,
|
||||
0x57, 0x0b, 0x9e, 0x35, 0xdb, 0x0b, 0x30, 0x49, 0x70, 0xdd, 0xd7, 0xb8,
|
||||
0x36, 0xcb, 0x45, 0x15, 0x32, 0x3a, 0xca, 0x29, 0x1c, 0x96, 0x99, 0xf8,
|
||||
0x5c, 0xe6, 0x85, 0x65, 0x9c, 0xef, 0xc4, 0x04, 0x91, 0x34, 0x5f, 0x5f,
|
||||
0xf1, 0x0d, 0x06, 0x97, 0xcd, 0x6e, 0xa6, 0x7e, 0x3f, 0xdd, 0xbc, 0x4b,
|
||||
0x99, 0x34, 0xb3, 0x83, 0x13, 0x2d, 0x6e, 0xe1, 0xf4, 0xb5, 0xc9, 0x7c,
|
||||
0x5b, 0x84, 0x81, 0x08, 0xe7, 0x19, 0x2e, 0x14, 0x51, 0x0d, 0x5e, 0x39,
|
||||
0x54, 0x9b, 0x34, 0xd9, 0x6a, 0x4c, 0xf1, 0x5f, 0x25, 0xdc, 0x19, 0xeb,
|
||||
0xb7, 0xa7, 0xf4, 0x6f, 0x9f, 0xc4, 0x4b, 0x0b, 0x73, 0xea, 0x28, 0x90,
|
||||
0xff, 0xa2, 0x30, 0x63, 0x77, 0xa4, 0x26, 0x27, 0xf8, 0xd0, 0x24, 0xf1,
|
||||
0x2a, 0x27, 0x7e, 0x6a, 0x1d, 0xfd, 0xdc, 0x78, 0x4a, 0x6d, 0x1d, 0xb4,
|
||||
0x8e, 0xb7, 0xbe, 0x6f, 0xc9, 0x2e, 0xb6, 0x73, 0x63, 0xbb, 0x5e, 0x13,
|
||||
0xba, 0x4d, 0x5e, 0xde, 0x85, 0xef, 0xe9, 0x59, 0x73, 0x03, 0xe1, 0xc0,
|
||||
0xa5, 0xe3, 0xa6, 0x59, 0x87, 0x81, 0xe9, 0xef, 0x3f, 0x03, 0x00, 0x00,
|
||||
0xff, 0xff, 0x77, 0x1f, 0xe2, 0xa5, 0x2d, 0x18, 0x00, 0x00,
|
||||
},
|
||||
"conf/app.ini",
|
||||
)
|
||||
|
|
|
@ -62,8 +62,9 @@ var (
|
|||
DisableGravatar bool
|
||||
|
||||
// Log settings.
|
||||
LogModes []string
|
||||
LogConfigs []string
|
||||
LogRootPath string
|
||||
LogModes []string
|
||||
LogConfigs []string
|
||||
|
||||
// Cache settings.
|
||||
Cache cache.Cache
|
||||
|
@ -145,7 +146,8 @@ func NewConfigContext() {
|
|||
SshPort = Cfg.MustInt("server", "SSH_PORT", 22)
|
||||
OfflineMode = Cfg.MustBool("server", "OFFLINE_MODE")
|
||||
DisableRouterLog = Cfg.MustBool("server", "DISABLE_ROUTER_LOG")
|
||||
StaticRootPath = Cfg.MustValue("server", "STATIC_ROOT_PATH")
|
||||
StaticRootPath = Cfg.MustValue("server", "STATIC_ROOT_PATH", workDir)
|
||||
LogRootPath = Cfg.MustValue("log", "ROOT_PATH", path.Join(workDir, "log"))
|
||||
|
||||
InstallLock = Cfg.MustBool("security", "INSTALL_LOCK")
|
||||
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
|
||||
|
@ -233,7 +235,7 @@ func newLogService() {
|
|||
case "console":
|
||||
LogConfigs[i] = fmt.Sprintf(`{"level":%s}`, level)
|
||||
case "file":
|
||||
logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log")
|
||||
logPath := Cfg.MustValue(modeSec, "FILE_NAME", path.Join(LogRootPath, "gogs.log"))
|
||||
os.MkdirAll(path.Dir(logPath), os.ModePerm)
|
||||
LogConfigs[i] = fmt.Sprintf(
|
||||
`{"level":%s,"filename":"%s","rotate":%v,"maxlines":%d,"maxsize":%d,"daily":%v,"maxdays":%d}`, level,
|
||||
|
|
|
@ -185,6 +185,8 @@ func Config(ctx *middleware.Context) {
|
|||
ctx.Data["RunUser"] = setting.RunUser
|
||||
ctx.Data["RunMode"] = strings.Title(martini.Env)
|
||||
ctx.Data["RepoRootPath"] = setting.RepoRootPath
|
||||
ctx.Data["StaticRootPath"] = setting.StaticRootPath
|
||||
ctx.Data["LogRootPath"] = setting.LogRootPath
|
||||
ctx.Data["ScriptType"] = setting.ScriptType
|
||||
|
||||
ctx.Data["Service"] = setting.Service
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.3.6.0525 Alpha
|
||||
0.4.0.0528 Alpha
|
|
@ -30,6 +30,10 @@
|
|||
<hr/>
|
||||
<dt>Repository Root Path</dt>
|
||||
<dd>{{.RepoRootPath}}</dd>
|
||||
<dt>Static File Root Path</dt>
|
||||
<dd>{{.StaticRootPath}}</dd>
|
||||
<dt>Log File Root Path</dt>
|
||||
<dd>{{.LogRootPath}}</dd>
|
||||
<dt>Script Type</dt>
|
||||
<dd>{{.ScriptType}}</dd>
|
||||
</dl>
|
||||
|
|
Loading…
Reference in a new issue