Skip to content

Commit f56281b

Browse files
authored
Merge pull request #2 from adberger/main
Log memlimit
2 parents bf56f77 + 7d4a9e4 commit f56281b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ toolchain go1.23.0
66

77
require (
88
github.com/BurntSushi/toml v1.4.0
9+
github.com/KimMachineGun/automemlimit v0.6.1
910
github.com/MakeNowJust/heredoc v1.0.0
1011
github.com/Masterminds/sprig/v3 v3.3.0
1112
github.com/Shopify/ejson v1.5.2
@@ -17,6 +18,7 @@ require (
1718
github.com/spf13/viper v1.14.0
1819
github.com/starkandwayne/goutils v0.0.0-20190115202530-896b8a6904be
1920
github.com/stretchr/testify v1.9.0
21+
go.uber.org/automaxprocs v1.6.0
2022
gopkg.in/yaml.v2 v2.4.0
2123
gopkg.in/yaml.v3 v3.0.1
2224
k8s.io/apimachinery v0.31.0
@@ -28,7 +30,6 @@ require (
2830

2931
require (
3032
dario.cat/mergo v1.0.1 // indirect
31-
github.com/KimMachineGun/automemlimit v0.6.1 // indirect
3233
github.com/Knetic/govaluate v3.0.0+incompatible // indirect
3334
github.com/Masterminds/goutils v1.1.1 // indirect
3435
github.com/Masterminds/semver/v3 v3.3.0 // indirect
@@ -100,7 +101,6 @@ require (
100101
github.com/xlab/treeprint v1.2.0 // indirect
101102
github.com/ziutek/utils v0.0.0-20190626152656-eb2a3b364d6c // indirect
102103
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
103-
go.uber.org/automaxprocs v1.6.0 // indirect
104104
golang.org/x/crypto v0.27.0 // indirect
105105
golang.org/x/net v0.27.0 // indirect
106106
golang.org/x/oauth2 v0.21.0 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
324324
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
325325
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
326326
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
327+
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
328+
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
327329
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
328330
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
329331
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=

subst/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package main
22

33
import (
4+
"log/slog"
5+
46
"github.com/KimMachineGun/automemlimit/memlimit"
57
"github.com/bedag/subst/subst/cmd"
68

@@ -16,6 +18,7 @@ func main() {
1618
memlimit.FromSystem,
1719
),
1820
),
21+
memlimit.WithLogger(slog.Default()),
1922
)
2023
cmd.Execute()
2124
}

0 commit comments

Comments
 (0)