Skip to content

Commit 7dd3cc8

Browse files
authored
overlord/ifacestate: drop task logs for delayed effects (#17148)
The task log contains debug information and does not look nice if it shows up on the terminal. Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>
1 parent 81ef146 commit 7dd3cc8

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

overlord/ifacestate/handlers.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ func (m *InterfaceManager) doSetupProfiles(task *state.Task, tomb *tomb.Tomb) er
261261
return fmt.Errorf("internal error: cannot delay backend effects without a handler task")
262262
}
263263
logger.Debugf("has delayed effects for snaps: %v", delayedEffects)
264-
task.Logf("delayed effects for snaps:\n%v", delayedEffects)
265264
err := DelayedBackendEffectsFor(delayedTask, triggeringSnap(snapsup.InstanceName()), delayedEffects)
266265
if err != nil {
267266
return err
@@ -2621,7 +2620,7 @@ func (m *InterfaceManager) doProcessDelayedSecurityBackendEffects(task *state.Ta
26212620
snapsWithDelayedEffects := newDelayedEffectsForSnaps()
26222621
for triggeredBySnap, affectedSnaps := range delayed.TriggeringSnaps {
26232622
if _, ok := successfulTriggeringSnaps[triggeredBySnap]; !ok {
2624-
task.Logf("skipping effects triggered by failed snap %q", triggeredBySnap)
2623+
logger.Noticef("skipping effects triggered by failed snap %q", triggeredBySnap)
26252624
continue
26262625
}
26272626

@@ -2646,7 +2645,7 @@ func (m *InterfaceManager) doProcessDelayedSecurityBackendEffects(task *state.Ta
26462645
continue
26472646
}
26482647

2649-
task.Logf("scheduling delayed effects for snap %q", affectedSnap)
2648+
logger.Noticef("scheduling delayed effects for snap %q", affectedSnap)
26502649

26512650
// One task per connected snap instance
26522651
updateTask := st.NewTask("apply-delayed-snap-security-backend-effects",

overlord/ifacestate/ifacestate_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13746,9 +13746,7 @@ func (s *interfaceManagerSuite) TestDelayedEffectsSetupProfilesRunThroughProduce
1374613746
effectsTasks := tsks[len(tsks)-4:]
1374713747

1374813748
c.Check(effectsTasks[0].Kind(), Equals, "process-delayed-security-backend-effects")
13749-
logs := strings.Join(effectsTasks[0].Log(), "\n")
13750-
c.Check(logs, testutil.Contains, `skipping effects triggered by failed snap "producer2"`)
13751-
c.Check(logs, testutil.Contains, `scheduling delayed effects for snap "consumer1"`)
13749+
c.Check(effectsTasks[0].Log(), HasLen, 0)
1375213750

1375313751
// setup-profiles will be automatically injected by auto-connect
1375413752
// before apply-delayed-snap-security-backend-effects for both the

0 commit comments

Comments
 (0)