mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-08-13 09:15:43 -04:00
use Stderr instead of Stdout for logging
This commit is contained in:
parent
d4b4992731
commit
0b75b429c3
32 changed files with 34 additions and 34 deletions
|
@ -46,7 +46,7 @@ func main() {
|
||||||
gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
|
gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)})).WithGroup("bootstrapper")
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)})).WithGroup("bootstrapper")
|
||||||
|
|
||||||
if *gRPCDebug {
|
if *gRPCDebug {
|
||||||
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
|
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
|
||||||
|
|
|
@ -27,5 +27,5 @@ func newCLILogger(cmd *cobra.Command) (debugLog, error) {
|
||||||
logLvl = slog.LevelDebug
|
logLvl = slog.LevelDebug
|
||||||
}
|
}
|
||||||
|
|
||||||
return slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logLvl})), nil
|
return slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logLvl})), nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
||||||
fs := afero.NewOsFs()
|
fs := afero.NewOsFs()
|
||||||
streamer := streamer.New(fs)
|
streamer := streamer.New(fs)
|
||||||
filetransferer := filetransfer.New(log.WithGroup("filetransfer"), streamer, filetransfer.DontShowProgress)
|
filetransferer := filetransfer.New(log.WithGroup("filetransfer"), streamer, filetransfer.DontShowProgress)
|
||||||
|
|
|
@ -62,7 +62,7 @@ func runDeploy(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(verbosity)}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(verbosity)}))
|
||||||
force, err := cmd.Flags().GetBool("force")
|
force, err := cmd.Flags().GetBool("force")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("getting force flag: %w", err)
|
return fmt.Errorf("getting force flag: %w", err)
|
||||||
|
|
|
@ -52,7 +52,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
||||||
log.With(slog.String("version", constants.BinaryVersion().String()), slog.String("cloudProvider", *csp)).
|
log.With(slog.String("version", constants.BinaryVersion().String()), slog.String("cloudProvider", *csp)).
|
||||||
Info("Starting disk-mapper")
|
Info("Starting disk-mapper")
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ func BenchmarkMapper(b *testing.B) {
|
||||||
}
|
}
|
||||||
|
|
||||||
passphrase := "benchmark"
|
passphrase := "benchmark"
|
||||||
mapper, free, err := diskencryption.New(testPath, slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo})))
|
mapper, free, err := diskencryption.New(testPath, slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelInfo})))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
b.Fatal("Failed to create mapper:", err)
|
b.Fatal("Failed to create mapper:", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug}))
|
||||||
|
|
||||||
jsEndpoint := flag.String("js-endpoint", "", "Join service endpoint to use.")
|
jsEndpoint := flag.String("js-endpoint", "", "Join service endpoint to use.")
|
||||||
csp := flag.String("csp", "", "Cloud service provider to use.")
|
csp := flag.String("csp", "", "Cloud service provider to use.")
|
||||||
|
|
|
@ -39,7 +39,7 @@ func runCheck(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
filesHelper, err := bazelfiles.New()
|
filesHelper, err := bazelfiles.New()
|
||||||
|
|
|
@ -39,7 +39,7 @@ func runFix(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
fileHelper, err := bazelfiles.New()
|
fileHelper, err := bazelfiles.New()
|
||||||
|
|
|
@ -39,7 +39,7 @@ func runUpgrade(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
fileHelper, err := bazelfiles.New()
|
fileHelper, err := bazelfiles.New()
|
||||||
|
|
|
@ -26,7 +26,7 @@ var (
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug}))
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
|
@ -43,7 +43,7 @@ func runCodegen(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
registry, prefix, name, tag, err := splitRepoTag(flags.imageRepoTag)
|
registry, prefix, name, tag, err := splitRepoTag(flags.imageRepoTag)
|
||||||
|
|
|
@ -34,7 +34,7 @@ func runMerge(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
log.Debug(fmt.Sprintf("Merging sum file from %q into %q.", flags.inputs, flags.output))
|
log.Debug(fmt.Sprintf("Merging sum file from %q into %q.", flags.inputs, flags.output))
|
||||||
|
|
|
@ -40,7 +40,7 @@ func runSum(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
registry, prefix, name, tag, err := splitRepoTag(flags.imageRepoTag)
|
registry, prefix, name, tag, err := splitRepoTag(flags.imageRepoTag)
|
||||||
|
|
|
@ -25,7 +25,7 @@ func main() {
|
||||||
initSecretHash := flag.String("initsecrethash", "", "brcypt hash of the init secret")
|
initSecretHash := flag.String("initsecrethash", "", "brcypt hash of the init secret")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelInfo}))
|
||||||
|
|
||||||
conn, err := libvirt.NewConnect(*libvirtURI)
|
conn, err := libvirt.NewConnect(*libvirtURI)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -49,7 +49,7 @@ func runInfo(cmd *cobra.Command, args []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
info, err := readInfoArgs(args)
|
info, err := readInfoArgs(args)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -53,7 +53,7 @@ func runEnvelopeMeasurements(cmd *cobra.Command, _ []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
f, err := os.Open(flags.in)
|
f, err := os.Open(flags.in)
|
||||||
|
|
|
@ -44,7 +44,7 @@ func runMergeMeasurements(cmd *cobra.Command, args []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
mergedMeasurements, err := readMeasurementsArgs(args)
|
mergedMeasurements, err := readMeasurementsArgs(args)
|
||||||
|
|
|
@ -52,7 +52,7 @@ func runMeasurementsUpload(cmd *cobra.Command, _ []string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
uploadC, uploadCClose, err := measurementsuploader.New(cmd.Context(), flags.region, flags.bucket, flags.distributionID, log)
|
uploadC, uploadCClose, err := measurementsuploader.New(cmd.Context(), flags.region, flags.bucket, flags.distributionID, log)
|
||||||
|
|
|
@ -58,7 +58,7 @@ func runUplosi(cmd *cobra.Command, _ []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
archiveC, archiveCClose, err := archive.New(cmd.Context(), flags.region, flags.bucket, flags.distributionID, log)
|
archiveC, archiveCClose, err := archive.New(cmd.Context(), flags.region, flags.bucket, flags.distributionID, log)
|
||||||
|
|
|
@ -46,7 +46,7 @@ func newDeleteCmd() *cobra.Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
func runDelete(cmd *cobra.Command, args []string) (retErr error) {
|
func runDelete(cmd *cobra.Command, args []string) (retErr error) {
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
||||||
|
|
||||||
deleteCfg, err := newDeleteConfig(cmd, ([3]string)(args[:3]))
|
deleteCfg, err := newDeleteConfig(cmd, ([3]string)(args[:3]))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -89,7 +89,7 @@ func runRecursiveDelete(cmd *cobra.Command, args []string) (retErr error) {
|
||||||
return fmt.Errorf("creating delete config: %w", err)
|
return fmt.Errorf("creating delete config: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
||||||
client, closeFn, err := staticupload.New(cmd.Context(), staticupload.Config{
|
client, closeFn, err := staticupload.New(cmd.Context(), staticupload.Config{
|
||||||
Bucket: deleteCfg.bucket,
|
Bucket: deleteCfg.bucket,
|
||||||
Region: deleteCfg.region,
|
Region: deleteCfg.region,
|
||||||
|
|
|
@ -60,7 +60,7 @@ func envCheck(_ *cobra.Command, _ []string) error {
|
||||||
|
|
||||||
func runUpload(cmd *cobra.Command, args []string) (retErr error) {
|
func runUpload(cmd *cobra.Command, args []string) (retErr error) {
|
||||||
ctx := cmd.Context()
|
ctx := cmd.Context()
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug})).WithGroup("attestationconfigapi")
|
||||||
|
|
||||||
uploadCfg, err := newConfig(cmd, ([3]string)(args[:3]))
|
uploadCfg, err := newConfig(cmd, ([3]string)(args[:3]))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -52,7 +52,7 @@ func runAdd(cmd *cobra.Command, _ []string) (retErr error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
log.Debug("Validating flags")
|
log.Debug("Validating flags")
|
||||||
|
|
|
@ -38,7 +38,7 @@ func runLatest(cmd *cobra.Command, _ []string) (retErr error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
log.Debug("Validating flags")
|
log.Debug("Validating flags")
|
||||||
|
|
|
@ -43,7 +43,7 @@ func runList(cmd *cobra.Command, _ []string) (retErr error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
log.Debug("Validating flags")
|
log.Debug("Validating flags")
|
||||||
|
|
|
@ -74,7 +74,7 @@ func runRemove(cmd *cobra.Command, _ []string) (retErr error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||||
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
log.Debug(fmt.Sprintf("Parsed flags: %+v", flags))
|
||||||
|
|
||||||
log.Debug("Validating flags")
|
log.Debug("Validating flags")
|
||||||
|
|
|
@ -51,7 +51,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
||||||
log.With(
|
log.With(
|
||||||
slog.String("version", constants.BinaryVersion().String()),
|
slog.String("version", constants.BinaryVersion().String()),
|
||||||
slog.String("cloudProvider", *provider),
|
slog.String("cloudProvider", *provider),
|
||||||
|
|
|
@ -34,7 +34,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
log := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
||||||
|
|
||||||
log.With(slog.String("version", constants.BinaryVersion().String())).
|
log.With(slog.String("version", constants.BinaryVersion().String())).
|
||||||
Info("Constellation Key Management Service")
|
Info("Constellation Key Management Service")
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelInfo}))
|
||||||
variantString := os.Getenv(constants.AttestationVariant)
|
variantString := os.Getenv(constants.AttestationVariant)
|
||||||
attestationVariant, err := variant.FromString(variantString)
|
attestationVariant, err := variant.FromString(variantString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -44,11 +44,11 @@ func main() {
|
||||||
// logLevel can be made a public variable so logging level can be changed dynamically.
|
// logLevel can be made a public variable so logging level can be changed dynamically.
|
||||||
// TODO (derpsteb): enable once we are on go 1.21.
|
// TODO (derpsteb): enable once we are on go 1.21.
|
||||||
// logLevel := new(slog.LevelVar)
|
// logLevel := new(slog.LevelVar)
|
||||||
// handler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel})
|
// handler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logLevel})
|
||||||
// logger := slog.New(handler)
|
// logger := slog.New(handler)
|
||||||
// logLevel.Set(flags.logLevel)
|
// logLevel.Set(flags.logLevel)
|
||||||
|
|
||||||
logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(flags.logLevel)}))
|
logger := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(flags.logLevel)}))
|
||||||
|
|
||||||
if flags.forwardMultipartReqs {
|
if flags.forwardMultipartReqs {
|
||||||
logger.Warn("configured to forward multipart uploads, this may leak data to AWS")
|
logger.Warn("configured to forward multipart uploads, this may leak data to AWS")
|
||||||
|
|
|
@ -27,7 +27,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)})).WithGroup("bootstrapper")
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)})).WithGroup("bootstrapper")
|
||||||
|
|
||||||
if *gRPCDebug {
|
if *gRPCDebug {
|
||||||
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
|
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
|
||||||
|
|
|
@ -25,7 +25,7 @@ func main() {
|
||||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
log := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
|
||||||
|
|
||||||
log.With(slog.String("version", constants.BinaryVersion().String()), slog.String("attestationVariant", *attestationVariant)).
|
log.With(slog.String("version", constants.BinaryVersion().String()), slog.String("attestationVariant", *attestationVariant)).
|
||||||
Info("Constellation Verification Service")
|
Info("Constellation Verification Service")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue