Просмотр исходного кода

StartIndexing() requires only repo info now

Achilleas Koutsou 6 лет назад
Родитель
Сommit
402bcc4409
3 измененных файлов с 7 добавлено и 7 удалено
  1. 1 1
      cmd/serv.go
  2. 3 3
      models/models_gin.go
  3. 3 3
      models/repo_editor.go

+ 1 - 1
cmd/serv.go

@@ -274,7 +274,7 @@ func runServ(c *cli.Context) error {
 	}
 	runGit(cmd, requestMode, user, owner, repo)
 	if requestMode == models.ACCESS_MODE_WRITE {
-		models.StartIndexing(user, owner, repo)
+		models.StartIndexing(*repo)
 	}
 	return nil
 

+ 3 - 3
models/models_gin.go

@@ -16,7 +16,7 @@ import (
 
 // StartIndexing sends an indexing request to the configured indexing service
 // for a repository.
-func StartIndexing(user, owner *User, repo *Repository) {
+func StartIndexing(repo Repository) {
 	go func() {
 		if setting.Search.IndexURL == "" {
 			log.Trace("Indexing not enabled")
@@ -43,7 +43,7 @@ func StartIndexing(user, owner *User, repo *Repository) {
 		client := http.Client{}
 		resp, err := client.Do(req)
 		if err != nil || resp.StatusCode != http.StatusOK {
-			log.Error(2, "Error submitting index request: %v", err)
+			log.Error(2, "Error submitting index request for [%d: %s]: %v", repo.ID, repo.FullName(), err)
 			return
 		}
 	}()
@@ -63,7 +63,7 @@ func RebuildIndex() error {
 	}
 	log.Trace("Found %d repositories to index", len(repos))
 	for _, repo := range repos {
-		StartIndexing(nil, nil, repo)
+		StartIndexing(*repo)
 	}
 	log.Trace("Rebuilding search index")
 	return nil

+ 3 - 3
models/repo_editor.go

@@ -194,7 +194,7 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
 		return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
 	}
 
-	StartIndexing(doer, repo.MustOwner(), repo)
+	StartIndexing(*repo)
 	return nil
 }
 
@@ -520,7 +520,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 	if err := annexSync(localPath); err != nil { // Run full annex sync
 		return err
 	}
-	annexUninit(localPath)                      // Uninitialise annex to prepare for deletion
-	StartIndexing(doer, repo.MustOwner(), repo) // Index the new data
+	annexUninit(localPath) // Uninitialise annex to prepare for deletion
+	StartIndexing(*repo)   // Index the new data
 	return DeleteUploads(uploads...)
 }