diff --git a/clout/js/common.go b/clout/js/common.go index d8e9cf98..37e789cc 100644 --- a/clout/js/common.go +++ b/clout/js/common.go @@ -5,6 +5,6 @@ import ( ) var log = logging.GetLogger("puccini.js") -var logEvaluate = logging.NewSubLogger(log, "evaluate") -var logValidate = logging.NewSubLogger(log, "validate") -var logConvert = logging.NewSubLogger(log, "convert") +var logEvaluate = logging.NewScopeLogger(log, "evaluate") +var logValidate = logging.NewScopeLogger(log, "validate") +var logConvert = logging.NewScopeLogger(log, "convert") diff --git a/clout/js/context.go b/clout/js/context.go index 13442755..61b9be61 100644 --- a/clout/js/context.go +++ b/clout/js/context.go @@ -48,7 +48,7 @@ func NewContext(name string, log logging.Logger, arguments map[string]string, qu AllowTimestamps: allowTimestamps, Pretty: pretty, Output: output, - Log: logging.NewSubLogger(log, name), + Log: logging.NewScopeLogger(log, name), Stdout: terminal.Stdout, Stderr: terminal.Stderr, Stdin: os.Stdin, diff --git a/go.mod b/go.mod index 5a2091d7..cba4ff35 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/fxamacker/cbor/v2 v2.4.0 github.com/segmentio/ksuid v1.0.4 github.com/spf13/cobra v1.3.0 - github.com/tliron/kutil v0.1.53 + github.com/tliron/kutil v0.1.55 github.com/tliron/yamlkeys v1.3.5 ) @@ -21,7 +21,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect github.com/docker/cli v20.10.12+incompatible // indirect - github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/distribution v2.8.0+incompatible // indirect github.com/docker/docker v20.10.12+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect github.com/emirpasic/gods v1.12.0 // indirect diff --git a/go.sum b/go.sum index d3949f72..93452b92 100644 --- a/go.sum +++ b/go.sum @@ -301,8 +301,9 @@ github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgns github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY= +github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U= github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= @@ -877,8 +878,8 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tliron/kutil v0.1.53 h1:If2MzPJTikxhyumj6bslq69mpxkfXpON9XfSyJLf0rs= -github.com/tliron/kutil v0.1.53/go.mod h1:TdquwxFN0PBuw/avcFHIFFZZMXINaY5/fB7g/hM3UY4= +github.com/tliron/kutil v0.1.55 h1:VUBwGLxnATLeaCFDhdNFRmIyIhRVwOjlw46YWIivTm4= +github.com/tliron/kutil v0.1.55/go.mod h1:TdquwxFN0PBuw/avcFHIFFZZMXINaY5/fB7g/hM3UY4= github.com/tliron/yamlkeys v1.3.5 h1:zfNwrtxNP9pyj2UJV8SgLj6jUP4bsHwFtBByZyIg4AM= github.com/tliron/yamlkeys v1.3.5/go.mod h1:8kJ1A/1s3p/I3MQUAbtv72dPEyQGoh0ZkQp0UAkABBo= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= diff --git a/puccini-clout/main.go b/puccini-clout/main.go index 906ada32..dbfec9bd 100644 --- a/puccini-clout/main.go +++ b/puccini-clout/main.go @@ -8,6 +8,7 @@ import ( ) func main() { + util.ExitOnSIGTERM() commands.Execute() util.Exit(0) } diff --git a/puccini-tosca/main.go b/puccini-tosca/main.go index 1be777f6..30304c99 100644 --- a/puccini-tosca/main.go +++ b/puccini-tosca/main.go @@ -8,6 +8,7 @@ import ( ) func main() { + util.ExitOnSIGTERM() commands.Execute() util.Exit(0) } diff --git a/tosca/grammars/cloudify_v1_3/common.go b/tosca/grammars/cloudify_v1_3/common.go index 18881992..ca77ebba 100644 --- a/tosca/grammars/cloudify_v1_3/common.go +++ b/tosca/grammars/cloudify_v1_3/common.go @@ -6,9 +6,9 @@ import ( ) var log = logging.GetLogger("puccini.grammars.cloudify_v1_3") -var logInherit = logging.NewSubLogger(log, "inherit") -var logRender = logging.NewSubLogger(log, "render") -var logNormalize = logging.NewSubLogger(log, "normalize") +var logInherit = logging.NewScopeLogger(log, "inherit") +var logRender = logging.NewScopeLogger(log, "render") +var logNormalize = logging.NewScopeLogger(log, "normalize") var Grammar = tosca.NewGrammar() diff --git a/tosca/grammars/hot/common.go b/tosca/grammars/hot/common.go index a04c535c..36e335de 100644 --- a/tosca/grammars/hot/common.go +++ b/tosca/grammars/hot/common.go @@ -6,8 +6,8 @@ import ( ) var log = logging.GetLogger("puccini.grammars.hot") -var logRender = logging.NewSubLogger(log, "render") -var logNormalize = logging.NewSubLogger(log, "normalize") +var logRender = logging.NewScopeLogger(log, "render") +var logNormalize = logging.NewScopeLogger(log, "normalize") var Grammar = tosca.NewGrammar() diff --git a/tosca/grammars/tosca_v1_2/common.go b/tosca/grammars/tosca_v1_2/common.go index 7dbcfc5c..105f23e2 100644 --- a/tosca/grammars/tosca_v1_2/common.go +++ b/tosca/grammars/tosca_v1_2/common.go @@ -8,7 +8,7 @@ import ( ) var log = logging.GetLogger("puccini.grammars.tosca_v1_2") -var logRender = logging.NewSubLogger(log, "render") +var logRender = logging.NewScopeLogger(log, "render") var Grammar = tosca.NewGrammar() diff --git a/tosca/grammars/tosca_v2_0/common.go b/tosca/grammars/tosca_v2_0/common.go index 5e28366c..ef08ef69 100644 --- a/tosca/grammars/tosca_v2_0/common.go +++ b/tosca/grammars/tosca_v2_0/common.go @@ -6,9 +6,9 @@ import ( ) var log = logging.GetLogger("puccini.grammars.tosca_v2_0") -var logInherit = logging.NewSubLogger(log, "inherit") -var logRender = logging.NewSubLogger(log, "render") -var logNormalize = logging.NewSubLogger(log, "normalize") +var logInherit = logging.NewScopeLogger(log, "inherit") +var logRender = logging.NewScopeLogger(log, "render") +var logNormalize = logging.NewScopeLogger(log, "normalize") var Grammar = tosca.NewGrammar() diff --git a/tosca/parser/common.go b/tosca/parser/common.go index 04c52cee..98c8f592 100644 --- a/tosca/parser/common.go +++ b/tosca/parser/common.go @@ -5,10 +5,10 @@ import ( ) var log = logging.GetLogger("puccini.parser") -var logRead = logging.NewSubLogger(log, "read") -var logNamespaces = logging.NewSubLogger(log, "namespaces") -var logLookup = logging.NewSubLogger(log, "lookup") -var logHierarchies = logging.NewSubLogger(log, "hierarchies") -var logInheritance = logging.NewSubLogger(log, "inheritance") -var logTasks = logging.NewSubLogger(log, "tasks") -var logGather = logging.NewSubLogger(log, "gather") +var logRead = logging.NewScopeLogger(log, "read") +var logNamespaces = logging.NewScopeLogger(log, "namespaces") +var logLookup = logging.NewScopeLogger(log, "lookup") +var logHierarchies = logging.NewScopeLogger(log, "hierarchies") +var logInheritance = logging.NewScopeLogger(log, "inheritance") +var logTasks = logging.NewScopeLogger(log, "tasks") +var logGather = logging.NewScopeLogger(log, "gather")