fix rebase

f0ssel · f0ssel · commit a16dc3e21139 · 2022-03-25T15:33:31.000Z
diff --git a/cli/start.go b/cli/start.go
@@ -65,7 +65,7 @@ func start() *cobra.Command {
 				// Default to the environment variable!
 				postgresURL = os.Getenv("CODER_PG_CONNECTION_URL")
 			}
-			logger := slog.Make(sloghuman.Sink(os.Stderr))
+
 			listener, err := net.Listen("tcp", address)
 			if err != nil {
 				return xerrors.Errorf("listen %q: %w", address, err)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func start() *cobra.Command {`
`65`	`65`	`// Default to the environment variable!`
`66`	`66`	`postgresURL = os.Getenv("CODER_PG_CONNECTION_URL")`
`67`	`67`	`}`
`68`		`- logger := slog.Make(sloghuman.Sink(os.Stderr))`
	`68`	`+`
`69`	`69`	`listener, err := net.Listen("tcp", address)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return xerrors.Errorf("listen %q: %w", address, err)`