Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make hook status printing configurable with delay #9641

Merged
merged 9 commits into from
Jan 12, 2020
Merged

Make hook status printing configurable with delay #9641

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db26235
Delay printing hook statuses until after 1 second
zeripath Jan 7, 2020
5ebf173
Move to a 5s delay, wrapped writer structure and add config
zeripath Jan 11, 2020
ea9fa36
Merge branch 'master' into fix-9610
zeripath Jan 11, 2020
d05d547
Update cmd/hook.go
zeripath Jan 11, 2020
6bc7810
Apply suggestions from code review
zeripath Jan 11, 2020
f0cfc74
Merge branch 'master' into fix-9610
zeripath Jan 11, 2020
8530ad3
Merge branch 'master' into fix-9610
zeripath Jan 12, 2020
b87df15
Update cmd/hook.go
zeripath Jan 12, 2020
65c6d8d
Merge branch 'master' into fix-9610
sapk Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
117 changes: 94 additions & 23 deletions cmd/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os"
"strconv"
"strings"
"time"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
Expand Down Expand Up @@ -101,6 +102,37 @@ Gitea or set your environment appropriately.`, "")
total := 0
lastline := 0

commsChan := make(chan string, 10)
tickerChan := make(chan struct{})
go func() {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
sb := strings.Builder{}
hasWritten := false
ticker := time.NewTicker(1 * time.Second)
zeripath marked this conversation as resolved.
Show resolved Hide resolved
loop:
for {
select {
case s, ok := <-commsChan:
if ok {
sb.WriteString(s)
zeripath marked this conversation as resolved.
Show resolved Hide resolved
} else if hasWritten {
hasWritten = true
zeripath marked this conversation as resolved.
Show resolved Hide resolved
os.Stdout.WriteString(sb.String())
os.Stdout.Sync()
sb.Reset()
break loop
}
case <-ticker.C:
hasWritten = true
os.Stdout.WriteString(sb.String())
os.Stdout.Sync()
sb.Reset()
}
}
sb.Reset()
ticker.Stop()
close(tickerChan)
}()

for scanner.Scan() {
// TODO: support news feeds for wiki
if isWiki {
Expand All @@ -124,12 +156,10 @@ Gitea or set your environment appropriately.`, "")
newCommitIDs[count] = newCommitID
refFullNames[count] = refFullName
count++
fmt.Fprintf(os.Stdout, "*")
os.Stdout.Sync()
commsChan <- "*"

if count >= hookBatchSize {
fmt.Fprintf(os.Stdout, " Checking %d branches\n", count)
zeripath marked this conversation as resolved.
Show resolved Hide resolved
os.Stdout.Sync()

hookOptions.OldCommitIDs = oldCommitIDs
hookOptions.NewCommitIDs = newCommitIDs
Expand All @@ -139,20 +169,22 @@ Gitea or set your environment appropriately.`, "")
case http.StatusOK:
// no-op
case http.StatusInternalServerError:
close(commsChan)
<-tickerChan
zeripath marked this conversation as resolved.
Show resolved Hide resolved
fail("Internal Server Error", msg)
default:
close(commsChan)
<-tickerChan
fail(msg, "")
}
count = 0
lastline = 0
}
} else {
fmt.Fprintf(os.Stdout, ".")
os.Stdout.Sync()
commsChan <- "."
}
if lastline >= hookBatchSize {
fmt.Fprintf(os.Stdout, "\n")
os.Stdout.Sync()
commsChan <- "\n"
lastline = 0
}
}
Expand All @@ -162,25 +194,28 @@ Gitea or set your environment appropriately.`, "")
hookOptions.NewCommitIDs = newCommitIDs[:count]
hookOptions.RefFullNames = refFullNames[:count]

fmt.Fprintf(os.Stdout, " Checking %d branches\n", count)
commsChan <- fmt.Sprintf(" Checking %d branches\n", count)
os.Stdout.Sync()

statusCode, msg := private.HookPreReceive(username, reponame, hookOptions)
switch statusCode {
case http.StatusInternalServerError:
close(commsChan)
<-tickerChan
fail("Internal Server Error", msg)
case http.StatusForbidden:
close(commsChan)
<-tickerChan
fail(msg, "")
}
} else if lastline > 0 {
fmt.Fprintf(os.Stdout, "\n")
os.Stdout.Sync()
commsChan <- "\n"
lastline = 0
}

fmt.Fprintf(os.Stdout, "Checked %d references in total\n", total)
os.Stdout.Sync()

commsChan <- fmt.Sprintf("Checked %d references in total\n", total)
close(commsChan)
<-tickerChan
return nil
}

Expand All @@ -206,6 +241,37 @@ Gitea or set your environment appropriately.`, "")
}
}

commsChan := make(chan string, 10)
tickerChan := make(chan struct{})
go func() {
sb := strings.Builder{}
hasWritten := false
ticker := time.NewTicker(1 * time.Second)
loop:
for {
select {
case s, ok := <-commsChan:
if ok {
sb.WriteString(s)
} else if hasWritten {
hasWritten = true
os.Stdout.WriteString(sb.String())
os.Stdout.Sync()
sb.Reset()
break loop
}
case <-ticker.C:
hasWritten = true
os.Stdout.WriteString(sb.String())
os.Stdout.Sync()
sb.Reset()
}
}
sb.Reset()
ticker.Stop()
close(tickerChan)
}()

// the environment setted on serv command
repoUser := os.Getenv(models.EnvRepoUsername)
isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
Expand Down Expand Up @@ -241,7 +307,7 @@ Gitea or set your environment appropriately.`, "")
continue
}

fmt.Fprintf(os.Stdout, ".")
commsChan <- "."
oldCommitIDs[count] = string(fields[0])
newCommitIDs[count] = string(fields[1])
refFullNames[count] = string(fields[2])
Expand All @@ -250,16 +316,16 @@ Gitea or set your environment appropriately.`, "")
}
count++
total++
os.Stdout.Sync()

if count >= hookBatchSize {
fmt.Fprintf(os.Stdout, " Processing %d references\n", count)
os.Stdout.Sync()
commsChan <- fmt.Sprintf(" Processing %d references\n", count)
hookOptions.OldCommitIDs = oldCommitIDs
hookOptions.NewCommitIDs = newCommitIDs
hookOptions.RefFullNames = refFullNames
resp, err := private.HookPostReceive(repoUser, repoName, hookOptions)
if resp == nil {
close(commsChan)
<-tickerChan
hookPrintResults(results)
fail("Internal Server Error", err)
}
Expand All @@ -274,12 +340,15 @@ Gitea or set your environment appropriately.`, "")
// We need to tell the repo to reset the default branch to master
err := private.SetDefaultBranch(repoUser, repoName, "master")
if err != nil {
close(commsChan)
<-tickerChan
fail("Internal Server Error", "SetDefaultBranch failed with Error: %v", err)
}
}
fmt.Fprintf(os.Stdout, "Processed %d references in total\n", total)
os.Stdout.Sync()
commsChan <- fmt.Sprintf("Processed %d references in total\n", total)

close(commsChan)
<-tickerChan
hookPrintResults(results)
return nil
}
Expand All @@ -288,19 +357,19 @@ Gitea or set your environment appropriately.`, "")
hookOptions.NewCommitIDs = newCommitIDs[:count]
hookOptions.RefFullNames = refFullNames[:count]

fmt.Fprintf(os.Stdout, " Processing %d references\n", count)
os.Stdout.Sync()
commsChan <- fmt.Sprintf(" Processing %d references\n", count)

resp, err := private.HookPostReceive(repoUser, repoName, hookOptions)
if resp == nil {
close(commsChan)
<-tickerChan
hookPrintResults(results)
fail("Internal Server Error", err)
}
wasEmpty = wasEmpty || resp.RepoWasEmpty
results = append(results, resp.Results...)

fmt.Fprintf(os.Stdout, "Processed %d references in total\n", total)
os.Stdout.Sync()
commsChan <- fmt.Sprintf("Processed %d references in total\n", total)

if wasEmpty && masterPushed {
// We need to tell the repo to reset the default branch to master
Expand All @@ -310,6 +379,8 @@ Gitea or set your environment appropriately.`, "")
}
}

close(commsChan)
<-tickerChan
hookPrintResults(results)

return nil
Expand Down