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

Unify logging in common/* #1826

Merged
merged 3 commits into from
Mar 15, 2021
Merged

Conversation

aquesnel
Copy link
Contributor

@aquesnel aquesnel commented Mar 6, 2021

Follow-on pull request to #1633 which migrates all logging in the common directory to use the LOG() and LOG_DEVEL() macros.

Changes:

  • Migrate logging to the LOG() and LOG_DEVEL() macros (using text transform script)
  • error logs use the LOG macro
  • update code formatting with astyle for all files in common/*
  • remove DEBUG macro

@matt335672
Copy link
Member

Apologies on the collision with xrdp_client_info.h. Since my PR also ran astyle on this file, it's a simple fix.

All looks absolutely fine, with just one question on common/pixman-region.c which is probably best answered by @metalefty

This file is originally from https://cgit.freedesktop.org/pixman/tree/pixman/pixman-region.c, and if I understand it correctly, is intended for systems which do not necessarily have pixman installed.

If we astyle this file, it will make it harder to compare it with upstream for regressions. On the other hand, this file is pretty mature now, and if we had serious problems we'd have found them by now.

For reference, the last time this file was modified is got a review comment here.

@aquesnel aquesnel force-pushed the unify_logging_common branch from da15691 to d73e45e Compare March 14, 2021 23:35
@aquesnel
Copy link
Contributor Author

aquesnel commented Mar 15, 2021

@matt335672 I've fixed up the merge conflicts.

For the common/pixman-region.c file, I agree that being able to compare it with upstream is valuable. The xrdp version of the file being astyle'd should not cause too much of a problem with comparing with upstream since when we compare the files, we can just run astyle on both of them before the comparison to filter out all of the formatting differences.

The build is broken because of an issue with the github action runner image (see: actions/runner-images#2917 ). I've verified that the root cause for the failed package install is the same for the xrdp build and the build in the issue, namely that the libx32gcc-s1 package is not available from the package archive configured in the VM (see xrdp build with apt-get debugging enabled: https://github.com/aquesnel/xrdp/runs/2109124288?check_suite_focus=true#step:4:296 )

@matt335672
Copy link
Member

I'm happy with the common/pixman-region.c workaround you suggest, so I'll merge this one I think.

BTW, nice bit of detective work on the CI problem. You've made it clear that it's affecting users other than us, so I think we can leave it for a bit and see what happens. I've subscribed to the issue you've linked to above.

@matt335672 matt335672 merged commit 89875d1 into neutrinolabs:devel Mar 15, 2021
@aquesnel aquesnel deleted the unify_logging_common branch March 17, 2021 02:49
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