Skip to content
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.

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

update desktop to use slogger #1525

Merged
merged 6 commits into from
Dec 29, 2023

Conversation

James-Pickett
Copy link
Contributor

No description provided.

@James-Pickett James-Pickett marked this pull request as ready for review December 29, 2023 19:04
desktopProcAuthTokens: make(map[string]string),
controlRequestIntervalOverrider: controlRequestIntervalOverrider,
}

if rs.logger != nil {
rs.logger = log.With(rs.logger, "component", "desktop_runner_root_server")
if rs.slogger != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to enforce that rs.slogger is not nil, or will calls to rs.slogger.Log below fail gracefully when nil instead of panicking?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, now returning error if slogger is nil

RebeccaMahany
RebeccaMahany previously approved these changes Dec 29, 2023
Copy link
Contributor

@RebeccaMahany RebeccaMahany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just the one question -- if you decide to update, ping me and I can reapprove 🙂

@James-Pickett James-Pickett added this pull request to the merge queue Dec 29, 2023
Merged via the queue into kolide:main with commit 6cb95a7 Dec 29, 2023
25 checks passed
@James-Pickett James-Pickett deleted the james/desktop-use-slogger branch December 29, 2023 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants