serv/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 15:13:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#3589 LoadRepoConfig after ORM is initialized

Browse source
This commit is contained in:
Unknwon 2016-09-02 23:18:37 -04:00
parent c50d59874d
commit 6da55159a2
No known key found for this signature in database
GPG key ID: FB9F411CDD69BEC1
5 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.98.0901" const APP_VER = "0.9.98.0902"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
models/repo.go
View file

@ -613,10 +613,6 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
return nil, err return nil, err
} }
// Clone to temprory path and do the init commit.
tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("%d", time.Now().Nanosecond()))
os.MkdirAll(tmpDir, os.ModePerm)
repoPath := RepoPath(u.Name, opts.Name) repoPath := RepoPath(u.Name, opts.Name)
wikiPath := WikiPath(u.Name, opts.Name) wikiPath := WikiPath(u.Name, opts.Name)

1
models/repo_mirror.go
View file

@ -38,6 +38,7 @@ type Mirror struct {
} }
func (m *Mirror) BeforeInsert() { func (m *Mirror) BeforeInsert() {
m.UpdatedUnix = time.Now().Unix()
m.NextUpdateUnix = m.NextUpdate.Unix() m.NextUpdateUnix = m.NextUpdate.Unix()
} }

6
routers/install.go
View file

@ -65,14 +65,14 @@ func GlobalInit() {
if setting.InstallLock { if setting.InstallLock {
highlight.NewContext() highlight.NewContext()
markdown.BuildSanitizer() markdown.BuildSanitizer()
models.LoadRepoConfig()
models.NewRepoContext()
if err := models.NewEngine(); err != nil { if err := models.NewEngine(); err != nil {
log.Fatal(4, "Fail to initialize ORM engine: %v", err) log.Fatal(4, "Fail to initialize ORM engine: %v", err)
} }
models.HasEngine = true models.HasEngine = true
models.LoadRepoConfig()
models.NewRepoContext()
// Booting long running goroutines. // Booting long running goroutines.
cron.NewContext() cron.NewContext()
models.InitSyncMirrors() models.InitSyncMirrors()

2
templates/.VERSION
View file

@ -1 +1 @@
0.9.98.0901 0.9.98.0902