Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add stackdriver and json log options to coder server #5682

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

Merged
merged 9 commits into from
Jan 13, 2023
Merged

feat: add stackdriver and json log options to coder server #5682

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b32b696
feat: add stackdriver and json log options to `coder server`
coadler Jan 11, 2023
6ebb833
rename flags
coadler Jan 12, 2023
c9e3898
error if no loggers configured
coadler Jan 12, 2023
404d522
add testing
coadler Jan 12, 2023
d929d0f
fixup! add testing
coadler Jan 13, 2023
5d11042
fixup! add testing
coadler Jan 13, 2023
1a56dbe
fixup! add testing
coadler Jan 13, 2023
21eb106
fixup! add testing
coadler Jan 13, 2023
3c87011
fixup! add testing
coadler Jan 13, 2023
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
Prev Previous commit
Next Next commit
fixup! add testing
  • Loading branch information
@coadler
coadler committed Jan 13, 2023
commit d929d0fe5d510f93e79b035d64093dc1b5cede1e
4 changes: 2 additions & 2 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,9 +1535,9 @@ func buildLogger(cmd *cobra.Command, cfg *codersdk.DeploymentConfig) (slog.Logge
sinks = append(sinks, sinkFn(cmd.ErrOrStderr()))

default:
fi, err := os.OpenFile(cfg.Logging.Human.Value, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
fi, err := os.OpenFile(loc, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
if err != nil {
return xerrors.Errorf("open log file %q: %w", cfg.Logging.Human.Value, err)
return xerrors.Errorf("open log file %q: %w", loc, err)
}

closers = append(closers, fi.Close)
Expand Down
16 changes: 8 additions & 8 deletions cli/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ func TestServer(t *testing.T) {
require.Eventually(t, func() bool {
stat, err := os.Stat(fiName)
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
cancelFunc()
<-serverErr
})
Expand Down Expand Up @@ -1188,7 +1188,7 @@ func TestServer(t *testing.T) {
require.Eventually(t, func() bool {
stat, err := os.Stat(fi.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
cancelFunc()
<-serverErr
})
Expand Down Expand Up @@ -1217,10 +1217,10 @@ func TestServer(t *testing.T) {
serverErr <- root.ExecuteContext(ctx)
}()

require.Eventually(t, func() bool {
assert.Eventually(t, func() bool {
stat, err := os.Stat(fi.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
cancelFunc()
<-serverErr
})
Expand Down Expand Up @@ -1252,7 +1252,7 @@ func TestServer(t *testing.T) {
require.Eventually(t, func() bool {
stat, err := os.Stat(fi.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
cancelFunc()
<-serverErr
})
Expand Down Expand Up @@ -1298,15 +1298,15 @@ func TestServer(t *testing.T) {
require.Eventually(t, func() bool {
stat, err := os.Stat(fi1.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
require.Eventually(t, func() bool {
stat, err := os.Stat(fi2.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)
require.Eventually(t, func() bool {
stat, err := os.Stat(fi3.Name())
return err == nil && stat.Size() > 0
}, testutil.IntervalFast, testutil.WaitShort)
}, testutil.WaitShort, testutil.IntervalFast)

cancelFunc()
<-serverErr
Expand Down