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

Support include directive for config file #2878

Merged
merged 20 commits into from Feb 14, 2022

Conversation

mapengfei53
Copy link
Contributor

Summary

Support include import configuration

Details

Add include to import multiple configuration files, similar to nginx.

@codecov-commenter
Copy link

codecov-commenter commented Jan 12, 2022

Codecov Report

Merging #2878 (9f5850e) into develop (27e5d77) will increase coverage by 0.15%.
The diff coverage is 98.23%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2878      +/-   ##
===========================================
+ Coverage    60.09%   60.24%   +0.15%     
===========================================
  Files          121      121              
  Lines        51310    51522     +212     
===========================================
+ Hits         30836    31041     +205     
- Misses       20474    20481       +7     

| Impacted Files | Coverage Δ | |'

Translated to English while maintaining the markdown structure:

'| Impacted Files | Coverage Δ | |
|---|---|---|
| trunk/src/app/srs_app_config.hpp | 100.00% <ø> (ø) | |'

Translated to English while maintaining the markdown structure:

| trunk/src/app/srs_app_config.hpp | 100.00% <ø> (ø) | |
| trunk/src/app/srs_app_config.cpp | 65.48% <92.59%> (+0.19%) | ⬆️ |
| trunk/src/utest/srs_utest_config.cpp | 99.85% <100.00%> (+0.06%) | ⬆️ |
| trunk/src/app/srs_app_source.cpp | 0.66% <0.00%> (-0.01%) | ⬇️ |
| trunk/src/core/srs_core_autofree.hpp | 93.33% <0.00%> (ø) | |
| trunk/src/app/srs_app_latest_version.cpp | 0.00% <0.00%> (ø) | |
| trunk/src/protocol/srs_service_http_conn.cpp | 94.39% <0.00%> (ø) | |

Translated to English while maintaining the markdown structure:

| trunk/src/core/srs_core_autofree.hpp | 93.33% <0.00%> (ø) | |
| trunk/src/app/srs_app_latest_version.cpp | 0.00% <0.00%> (ø) | |
| trunk/src/protocol/srs_service_http_conn.cpp | 94.39% <0.00%> (ø) | |
| trunk/src/utest/srs_utest_http.cpp | 99.74% <0.00%> (+<0.01%) | ⬆️ |


Continue to review full report at Codecov.

Legend - Click here to learn more
| Δ = absolute <relative> (impact), ø = not affected, ? = missing data |

Translated to English while maintaining the markdown structure:

| Δ = absolute <relative> (impact), ø = not affected, ? = missing data |

Powered by Codecov. Last update 27e5d77...9f5850e. Read the comment docs.

TRANS_BY_GPT3

@winlinvip
Copy link
Member

winlinvip commented Jan 13, 2022

Thank you, 👍

This feature has been mentioned before, to support the nginx include directive, but no one has implemented it until today: #1399

Also, please make sure to add Utest coverage to verify that specific configurations are working correctly. We have previously added Utest testing to our configuration file parsing.

TRANS_BY_GPT3

@mapengfei53
Copy link
Contributor Author

mapengfei53 commented Jan 13, 2022

Okay, I will try my best to improve the code. Thank you.

TRANS_BY_GPT3

@winlinvip winlinvip self-assigned this Jan 13, 2022
@winlinvip winlinvip added Enhancement Improvement or enhancement. Feature It's a new feature. labels Jan 13, 2022
@winlinvip
Copy link
Member

winlinvip commented Jan 13, 2022

In addition, please branch from develop, submit to develop. Currently, version 4.0 has been released and no new features will be added, only bug fixes.

TRANS_BY_GPT3

@mapengfei53
Copy link
Contributor Author

mapengfei53 commented Jan 14, 2022

Okay

TRANS_BY_GPT3

@winlinvip winlinvip closed this Jan 17, 2022
@winlinvip
Copy link
Member

winlinvip commented Jan 17, 2022

You can continue using this PR. If you don't know how to operate it, you can contact me on WeChat.

TRANS_BY_GPT3

@winlinvip winlinvip reopened this Jan 17, 2022
@mapengfei53 mapengfei53 changed the base branch from 4.0release to develop January 17, 2022 03:14
@mapengfei53
Copy link
Contributor Author

mapengfei53 commented Jan 17, 2022

You can continue using this PR. If you don't know how to operate, you can contact me on WeChat.

I had something come up over the weekend, which delayed me from resubmitting. I apologize for the inconvenience.

TRANS_BY_GPT3

@winlinvip winlinvip changed the base branch from develop to 4.0release January 17, 2022 03:25
@winlinvip winlinvip changed the base branch from 4.0release to develop January 17, 2022 03:48
@winlinvip winlinvip changed the title Support include import configuration Support include directive for config file Jan 27, 2022
@winlinvip
Copy link
Member

winlinvip commented Feb 10, 2022

Thank you very much for making so many improvements, hahaha.

I think this PR has been done very well, thank you very much.

However, there is still a slight gap from what I want. I will make some further improvements based on your work. 😄

TRANS_BY_GPT3

@mapengfei53 mapengfei53 reopened this Feb 10, 2022
@jinleileiking

This comment was marked as spam.

@winlinvip winlinvip merged commit fde4488 into ossrs:develop Feb 14, 2022
@mapengfei53 mapengfei53 deleted the bugfix/bug-summary branch February 16, 2022 03:20
@winlinvip winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Improvement or enhancement. Feature It's a new feature. TransByAI Translated by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Does the srs configuration file support a similar include directive as in nginx?
4 participants