Skip to content

Commit 5ba3741

Browse files
author
Aaron Schlesinger
committed
fix(boot.go,pkg/cleaner/cleaner.go): don't pass the cleaner ref into itself
1 parent 9b83225 commit 5ba3741

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

boot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func main() {
7272
log.Printf("Starting deleted app cleaner")
7373
cleanerErrCh := make(chan error)
7474
go func() {
75-
if err := cleanerRef.Run(gitHomeDir, kubeClient.Namespaces(), cleanerRef, cnf.CleanerPollSleepDuration()); err != nil {
75+
if err := cleanerRef.Run(gitHomeDir, kubeClient.Namespaces(), cnf.CleanerPollSleepDuration()); err != nil {
7676
cleanerErrCh <- err
7777
}
7878
}()

pkg/cleaner/cleaner.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func dirHasGitSuffix(dir string) bool {
103103
}
104104

105105
// Run starts the deleted app cleaner. Every pollSleepDuration, it compares the result of nsLister.List with the directories in the top level of gitHome on the local file system. On any error, it uses log messages to output a human readable description of what happened.
106-
func (c Ref) Run(gitHome string, nsLister k8s.NamespaceLister, ref Ref, pollSleepDuration time.Duration) error {
106+
func (c Ref) Run(gitHome string, nsLister k8s.NamespaceLister, pollSleepDuration time.Duration) error {
107107
for {
108108
nsList, err := nsLister.List(labels.Everything(), fields.Everything())
109109
if err != nil {
@@ -128,11 +128,11 @@ func (c Ref) Run(gitHome string, nsLister k8s.NamespaceLister, ref Ref, pollSlee
128128

129129
for _, appToDelete := range appsToDelete {
130130
dirToDelete := appToDelete + dotGitSuffix
131-
ref.Lock()
131+
c.Lock()
132132
if err := os.RemoveAll(dirToDelete); err != nil {
133133
log.Printf("Cleaner error removing deleted app %s (%s)", dirToDelete, err)
134134
}
135-
ref.Unlock()
135+
c.Unlock()
136136
}
137137

138138
time.Sleep(pollSleepDuration)

0 commit comments

Comments
 (0)