prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

And a few more capatalization undos.

Browse Source
This commit is contained in:
Satnam Singh 2014-09-24 10:16:05 -07:00
parent 3f45b35768
commit 1bdbb73c0e
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manager/manager.go
View File

@ -145,7 +145,6 @@ func (self *manager) globalHousekeeping(quit chan error) {
}
ticker := time.Tick(*globalHousekeepingInterval)
<<<<<<< HEAD
for {
select {
case t := <-ticker:
@ -156,16 +155,6 @@ func (self *manager) globalHousekeeping(quit chan error) {
if err != nil {
glog.Errorf("Failed to detect containers: %s", err)
}
=======
for t := range ticker {
start := time.Now()
// Check for new containers.
err := self.detectSubcontainers("/")
if err != nil {
glog.Errorf("Failed to detect containers: %s", err)
}
>>>>>>> Undo changes to if statements as requested by vmarmol. Fix typos in my changes.
// Log if housekeeping took too long.
duration := time.Since(start)
@ -423,7 +412,7 @@ func (self *manager) watchForNewContainers(quit chan error) error {
root, ok = self.containers["/"]
}()
if !ok {
return fmt.Errorf("root container does not exist when watching for new containers")
return fmt.Errorf("Root container does not exist when watching for new containers")
}
// Register for new subcontainers.
@ -439,15 +428,14 @@ func (self *manager) watchForNewContainers(quit chan error) error {
}
// Listen to events from the container handler.
<<<<<<< HEAD
go func() {
for {
select {
case event := <-events:
switch {
case event.EventType == container.SUBCONTAINER_ADD:
case event.EventType == container.SubcontainerAdd:
err = self.createContainer(event.Name)
case event.EventType == container.SUBCONTAINER_DELETE:
case event.EventType == container.SubcontainerDelete:
err = self.destroyContainer(event.Name)
}
if err != nil {
@ -462,17 +450,6 @@ func (self *manager) watchForNewContainers(quit chan error) error {
return
}
}
=======
for event := range events {
switch {
case event.EventType == container.SubcontainerAdd:
err = self.createContainer(event.Name)
case event.EventType == container.SubcontainerDelete:
err = self.destroyContainer(event.Name)
}
if err != nil {
glog.Warning("failed to process watch event: %v", err)
>>>>>>> Undo changes to if statements as requested by vmarmol. Fix typos in my changes.
}
}()
return nil