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

config: keep track of import instead of modifying file name #5540

Merged
merged 2 commits into from
May 25, 2023

Conversation

WeidiDeng
Copy link
Member

Previously when implementing variadic placeholders, caddy config token's File will be modified to reflect their import chain to help debug config error. One side effect is the extra colon for imported files in file_server.

This patch uses a separate field to track import chain, and still keeps the error output the same.

Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

Oh, yess -- thank you. I'll await Francis' approval when he has a chance as well (no rush).

@francislavoie francislavoie added this to the v2.7.0 milestone May 24, 2023
Copy link
Member

@francislavoie francislavoie left a comment

Choose a reason for hiding this comment

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

Yeah, this is much better! Thanks!

Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

Happy to try this out 😃

Thank you as usual, @WeidiDeng !

@mholt mholt merged commit 9cde715 into master May 25, 2023
@mholt mholt deleted the import_file_stack branch May 25, 2023 19:05
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.

3 participants