Add error checks per report from errcheck-ng

This commit is contained in:
Oleksii Kliukin
2017-06-08 10:41:44 +02:00
committed by Oleksii Kliukin
parent 292a9bda05
commit bc0e9ab4bc
9 changed files with 48 additions and 19 deletions
+8 -4
View File
@@ -96,11 +96,13 @@ func (c *Controller) initController() {
c.opConfig.ResyncPeriod,
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
c.postgresqlInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
if err := c.postgresqlInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: c.postgresqlAdd,
UpdateFunc: c.postgresqlUpdate,
DeleteFunc: c.postgresqlDelete,
})
}); err != nil {
c.logger.Fatalf("could not add event handlers: %v", err)
}
// Pods
podLw := &cache.ListWatch{
@@ -114,11 +116,13 @@ func (c *Controller) initController() {
c.opConfig.ResyncPeriodPod,
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
c.podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
if err := c.podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: c.podAdd,
UpdateFunc: c.podUpdate,
DeleteFunc: c.podDelete,
})
}); err != nil {
c.logger.Fatalf("could not add event handlers: %v", err)
}
c.clusterEventQueues = make([]*cache.FIFO, c.opConfig.Workers)
for i := range c.clusterEventQueues {
+6 -2
View File
@@ -183,7 +183,9 @@ func (c *Controller) processEvent(obj interface{}) error {
func (c *Controller) processClusterEventsQueue(idx int) {
for {
c.clusterEventQueues[idx].Pop(cache.PopProcessFunc(c.processEvent))
if _, err := c.clusterEventQueues[idx].Pop(cache.PopProcessFunc(c.processEvent)); err != nil {
c.logger.Errorf("error when processing cluster events queue: %v", err)
}
}
}
@@ -224,7 +226,9 @@ func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec
}
//TODO: if we delete cluster, discard all the previous events for the cluster
c.clusterEventQueues[workerID].Add(clusterEvent)
if err := c.clusterEventQueues[workerID].Add(clusterEvent); err != nil {
c.logger.WithField("worker", workerID).Errorf("error when queueing cluster event: %v", clusterEvent)
}
c.logger.WithField("worker", workerID).Infof("%s of the '%s' cluster has been queued", eventType, clusterName)
}