burble/nomad-driver-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loggers.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-12-17 18:00:02 -08:00
parent 44cbe74881
commit ffb973ea72
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containerd/driver.go
View File

@ -309,7 +309,7 @@ func (d *Driver) buildFingerprint() *drivers.Fingerprint {
isRunning, err := d.isContainerdRunning() isRunning, err := d.isContainerdRunning()
if err != nil || !isRunning { if err != nil || !isRunning {
if err != nil { if err != nil {
d.logger.Error("Error in buildFingerprint(): failed to get containerd status: %v", err) d.logger.Error(fmt.Sprintf("Error in buildFingerprint(): failed to get containerd status: %v\n", err))
} }
fp.Health = drivers.HealthStateUnhealthy fp.Health = drivers.HealthStateUnhealthy
fp.HealthDescription = "Unhealthy" fp.HealthDescription = "Unhealthy"
@ -319,7 +319,7 @@ func (d *Driver) buildFingerprint() *drivers.Fingerprint {
// Get containerd version // Get containerd version
version, err := d.getContainerdVersion() version, err := d.getContainerdVersion()
if err != nil { if err != nil {
d.logger.Warn("Error in buildFingerprint(): failed to get containerd version: %v", err) d.logger.Warn(fmt.Sprintf("Error in buildFingerprint(): failed to get containerd version: %v\n", err))
return fp return fp
} }
@ -394,13 +394,13 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
return nil, nil, fmt.Errorf("Error in creating container: %v", err) return nil, nil, fmt.Errorf("Error in creating container: %v", err)
} }
d.logger.Info(fmt.Sprintf("Successfully created container with name: %s", containerName)) d.logger.Info(fmt.Sprintf("Successfully created container with name: %s\n", containerName))
task, err := d.createTask(container, cfg.StdoutPath, cfg.StderrPath) task, err := d.createTask(container, cfg.StdoutPath, cfg.StderrPath)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("Error in creating task: %v", err) return nil, nil, fmt.Errorf("Error in creating task: %v", err)
} }
d.logger.Info(fmt.Sprintf("Successfully created task with ID: %s", task.ID())) d.logger.Info(fmt.Sprintf("Successfully created task with ID: %s\n", task.ID()))
h := &taskHandle{ h := &taskHandle{
taskConfig: cfg, taskConfig: cfg,
@ -499,7 +499,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
go h.run(d.ctxContainerd) go h.run(d.ctxContainerd)
} }
d.logger.Info(fmt.Sprintf("Task with ID: %s recovered successfully.", handle.Config.ID)) d.logger.Info(fmt.Sprintf("Task with ID: %s recovered successfully.\n", handle.Config.ID))
return nil return nil
} }
@ -605,7 +605,7 @@ func (d *Driver) TaskStats(ctx context.Context, taskID string, interval time.Dur
if err != nil { if err != nil {
d.logger.Warn("Error parsing driver stats interval, fallback on default interval") d.logger.Warn("Error parsing driver stats interval, fallback on default interval")
} else { } else {
msg := fmt.Sprintf("Overriding client stats interval: %v with driver stats interval: %v", interval, d.config.StatsInterval) msg := fmt.Sprintf("Overriding client stats interval: %v with driver stats interval: %v\n", interval, d.config.StatsInterval)
d.logger.Debug(msg) d.logger.Debug(msg)
interval = statsInterval interval = statsInterval
} }