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

Merge pull request #677 from rjnagal/validate

Browse Source 
Publish creation event for pre-existing containers on start-up.
This commit is contained in:
Victor Marmol 2015-05-04 12:54:31 -07:00
commit 97266fc69c
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manager/manager.go
View File

@ -692,26 +692,24 @@ func (m *manager) createContainer(containerName string) error {
return err return err
} }
if contSpec.CreationTime.After(m.startupTime) { contRef, err := cont.handler.ContainerReference()
contRef, err := cont.handler.ContainerReference() if err != nil {
if err != nil { return err
return err }
}
newEvent := &info.Event{ newEvent := &info.Event{
ContainerName: contRef.Name, ContainerName: contRef.Name,
Timestamp: contSpec.CreationTime, Timestamp: contSpec.CreationTime,
EventType: info.EventContainerCreation, EventType: info.EventContainerCreation,
EventData: info.EventData{ EventData: info.EventData{
Created: &info.CreatedEventData{ Created: &info.CreatedEventData{
Spec: contSpec, Spec: contSpec,
},
}, },
} },
err = m.eventHandler.AddEvent(newEvent) }
if err != nil { err = m.eventHandler.AddEvent(newEvent)
return err if err != nil {
} return err
} }
// Start the container's housekeeping. // Start the container's housekeeping.