fix errors after merge

  * change models.DbCfg to setting.Database
  * return an error from the anon function in GitGcRepos rather than
    directly logging and always returning nil. Ensures early return from
    that func on error

Author: aswild

cmd/dump.go

@@ -70,8 +70,8 @@ func runDump(ctx *cli.Context) error {
 
 	if ctx.Bool("dbonly") {
 		targetDBType := ctx.String("database")
-		if len(targetDBType) > 0 && targetDBType != models.DbCfg.Type {
-			log.Printf("Dumping database %s => %s...", models.DbCfg.Type, targetDBType)
+		if len(targetDBType) > 0 && targetDBType != setting.Database.Type {
+			log.Printf("Dumping database %s => %s...", setting.Database.Type, targetDBType)
 		} else {
 			log.Printf("Dumping database...")
 		}

models/repo.go

@@ -2238,15 +2238,15 @@ func GitGcRepos() {
 			func(idx int, bean interface{}) error {
 				repo := bean.(*Repository)
 				if err := repo.GetOwner(); err != nil {
-					log.Error("GitGcRepos: repo.GetOwner: %v", err)
+					return errors.New(fmt.Sprintf("GitGcRepos: repo.GetOwner: %v", err))
 				}
 				log.Trace("Running git gc on repository %v", repo.FullName())
 				_, stderr, err := process.GetManager().ExecDir(
 					time.Duration(setting.Git.Timeout.GC)*time.Second,
 					RepoPath(repo.Owner.Name, repo.Name), "Repository garbage collection",
 					git.GitExecutable, args...)
 				if err != nil {
-					log.Error("GitGcRepos: %v: %v", err, stderr)
+					return errors.New(fmt.Sprintf("GitGcRepos: %v: %v", err, stderr))
 				}
 				return nil
 			}); err != nil {