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.

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

Jump to bottom

Config: Support better env name for prefixed with srs #3370

Merged
merged 4 commits into from
Jan 11, 2023
Merged

Config: Support better env name for prefixed with srs #3370

merged 4 commits into from
Jan 11, 2023

Conversation

winlinvip
Copy link
Member

@winlinvip winlinvip commented Jan 9, 2023 •
edited
Loading

Some config items are prefixed with srs_, for example:

srs_log_tank
srs_log_level
srs_log_file

So when configured with env, the key is:

SRS_SRS_LOG_TANK is parsed as srs.srs_log_tank
SRS_SRS_LOG_LEVEL is parsed as srs.srs_log_level
SRS_SRS_LOG_FILE is parsed as srs.srs_log_file

It confuses people, so I add some configs as alias:

SRS_LOG_LEVEL is equal to SRS_SRS_LOG_TANK
SRS_LOG_LEVEL is equal to SRS_SRS_LOG_LEVEL
SRS_LOG_FILE is equal to SRS_SRS_LOG_FILE
SRS_LOG_LEVEL_V2 is equal to SRS_SRS_LOG_LEVEL_V2

Both are available.

@winlinvip winlinvip force-pushed the feature/micro-changes branch from bf76f0f to 47a5e27 Compare January 9, 2023 11:37
@winlinvip winlinvip changed the title Some micro changes. Config: Support better env name for prefixed with srs Jan 11, 2023
@winlinvip winlinvip merged commit a4e7427 into ossrs:5.0release Jan 11, 2023
winlinvip added a commit that referenced this pull request Jan 11, 2023
@winlinvip
SRS5: Config: Support better env name for prefixed with srs (#3370)
62d2b3c 
* Actions: Fix github action warnings.

* Forward: Bind the context id of source or stream.

* Config: Support better env names.

Co-authored-by: pengfei.ma <[email protected]>
Co-authored-by: Haibo Chen <[email protected]>

PICK a4e7427
winlinvip added a commit that referenced this pull request Jan 11, 2023
@winlinvip @mapengfei53 @duiniuluantanqin
SRS5: Config: Support better env name for prefixed with srs (#3370)
c74055d 
* Actions: Fix github action warnings.

* Forward: Bind the context id of source or stream.

* Config: Support better env names.

PICK a4e7427

Co-authored-by: pengfei.ma <[email protected]>
Co-authored-by: Haibo Chen <[email protected]>
winlinvip added a commit that referenced this pull request Jan 11, 2023
@winlinvip @mapengfei53 @duiniuluantanqin
SRS5: Config: Support better env name for prefixed with srs (#3370)
500d8fc 
* Actions: Fix github action warnings.

* Forward: Bind the context id of source or stream.

* Config: Support better env names.

PICK a4e7427

Co-authored-by: pengfei.ma <[email protected]>
Co-authored-by: Haibo Chen <[email protected]>
winlinvip added a commit that referenced this pull request Jan 11, 2023
@winlinvip @mapengfei53 @duiniuluantanqin
SRS5: Config: Support better env name for prefixed with srs (#3370)
498ce72 
* Actions: Fix github action warnings.

* Forward: Bind the context id of source or stream.

* Config: Support better env names.

PICK a4e7427

Co-authored-by: pengfei.ma <[email protected]>
Co-authored-by: Haibo Chen <[email protected]>
@winlinvip winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@duiniuluantanqin duiniuluantanqin duiniuluantanqin approved these changes

@mapengfei53 mapengfei53 mapengfei53 approved these changes

Assignees
No one assigned
Labels
EnglishNative This issue is conveyed exclusively in English.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@winlinvip @duiniuluantanqin @mapengfei53