Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(container)!: move logging and visualization options to DebugOption #10302

Merged
merged 8 commits into from
Oct 14, 2021
Merged

refactor(container)!: move logging and visualization options to DebugOption #10302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b29177f
refactor(container)!: move logging and visualization options to Debug…
aaronc Oct 4, 2021
da18284
add comments
aaronc Oct 4, 2021
8bb0c47
Merge branch 'master' into aaronc/container-debug-config
aaronc Oct 5, 2021
6ae02ad
update docs
aaronc Oct 5, 2021
b3b93c6
Merge remote-tracking branch 'origin/aaronc/container-debug-config' i…
aaronc Oct 5, 2021
c500199
Merge branch 'master' into aaronc/container-debug-config
aaronc Oct 5, 2021
6e6476d
Merge branch 'master' into aaronc/container-debug-config
mergify[bot] Oct 13, 2021
a8bda12
Merge branch 'master' into aaronc/container-debug-config
aaronc Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 0 additions & 173 deletions container/config.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

type container struct {
*config
*debugConfig

resolvers map[reflect.Type]resolver

Expand All @@ -26,9 +26,9 @@ type resolveFrame struct {
typ reflect.Type
}

func newContainer(cfg *config) *container {
func newContainer(cfg *debugConfig) *container {
return &container{
config: cfg,
debugConfig: cfg,
resolvers: map[reflect.Type]resolver{},
scopes: map[string]Scope{},
callerStack: nil,
Expand Down
22 changes: 12 additions & 10 deletions container/container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,17 +516,19 @@ func TestLogging(t *testing.T) {
require.NoError(t, err)
defer os.Remove(graphfile.Name())

require.NoError(t, container.Run(
require.NoError(t, container.RunDebug(
func() {},
container.Logger(func(s string) {
logOut += s
}),
container.Visualizer(func(g string) {
dotGraph = g
}),
container.LogVisualizer(),
container.FileVisualizer(graphfile.Name(), "svg"),
container.StdoutLogger(),
container.DebugOptions(
container.Logger(func(s string) {
logOut += s
}),
container.Visualizer(func(g string) {
dotGraph = g
}),
container.LogVisualizer(),
container.FileVisualizer(graphfile.Name(), "svg"),
container.StdoutLogger(),
),
))

require.Contains(t, logOut, "digraph")
Expand Down
Loading