public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/diagnostic-rest-api 

# Conflicts:
#	pkg/controller/controller.go
#	pkg/controller/postgresql.go
This commit is contained in:
Murat Kabilov 2017-07-27 14:32:19 +02:00
parent 5db09facd5 3ad4b127c4
commit ed0db7193c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/controller.go
View File

@ -200,4 +200,4 @@ func (c *Controller) runPostgresqlInformer(stopCh <-chan struct{}, wg *sync.Wait
defer wg.Done() defer wg.Done()
c.postgresqlInformer.Run(stopCh) c.postgresqlInformer.Run(stopCh)
} }

1
pkg/controller/postgresql.go
View File

@ -238,6 +238,7 @@ func (c *Controller) processClusterEventsQueue(idx int, stopCh <-chan struct{},
}() }()
<-stopCh <-stopCh
c.clusterEventQueues[idx].Close()
} }
func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec.EventType) { func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec.EventType) {