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

Refine docker detect mechenism. v5.0.190 v6.0.90 #3758

Merged
merged 5 commits into from
Oct 17, 2023
+54 −51
Merged

Refine docker detect mechenism. v5.0.190 v6.0.90 #3758

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eca40a5
Refine docker detect.
winlinvip Aug 7, 2023
6cd3717
Refine code.
winlinvip Aug 7, 2023
5a8b7e2
Merge develop
winlinvip Oct 13, 2023
b954ac6
Merge branch 'develop' into pr-bugfix/docker-detect
xiaozhihong Oct 17, 2023
f514671
Update release to v5.0.190 v6.0.90
xiaozhihong Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refine code.
@winlinvip
winlinvip committed Aug 7, 2023

Unverified

No user is associated with the committer email.
Learn about vigilant mode
commit 6cd37174a3d09561c3f02dd76ea6fe4d943ad690
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_config.cpp
View file
Original file line number Diff line number Diff line change
@@ -2890,7 +2890,7 @@ string SrsConfig::argv()

bool SrsConfig::get_daemon()
{
SRS_OVERWRITE_BY_ENV_BOOL2("srs.daemon");
SRS_OVERWRITE_BY_ENV_BOOL2("srs.daemon"); // SRS_DAEMON

SrsConfDirective* conf = root->get("daemon");
if (!conf || conf->arg0().empty()) {