mirror of https://github.com/ossrs/srs.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
0df81c3b34
During a Reload, several stages will be passed through:
1. Parsing new configurations: Parse.
2. Transforming configurations: Transform.
3. Applying configurations: Apply.
Previously, any error at any stage would result in a direct exit, making
the system completely dependent on configuration checks:
```bash
./objs/srs -c conf/srs.conf -t
echo $?
```
Optimized to: If an error occurs before applying the configuration, it
can be ignored. If an error occurs during the application of the
configuration, some of the configuration may have already taken effect,
leading to unpredictable behavior, so SRS will exit directly.
Added a new HTTP API to query the result of the reload.
```nginx
http_api {
enabled on;
raw_api {
enabled on;
allow_reload on;
}
}
```
```bash
curl http://localhost:1985/api/v1/raw?rpc=reload-fetch
```
```json
{
"code": 0,
"data": {
"err": 0,
"msg": "Success",
"state": 0,
"rid": "0s6y0n9"
}
}
{
"code": 0,
"data": {
"err": 1023,
"msg": "code=1023(ConfigInvalid) : parse file : parse buffer containers/conf/srs.release-local.conf : root parse : parse dir : parse include buffer containers/data/config/srs.vhost.conf : read token, line=0, state=0 : line 3: unexpected end of file, expecting ; or \"}\"",
"state": 1,
"rid": "0g4z471"
}
}
```
This way, you can know if the last reload of the system was successful.
---------
Co-authored-by: Haibo Chen <495810242@qq.com>
|
2 years ago | |
|---|---|---|
| .. | ||
| 3rdparty | 2 years ago | |
| auto | 2 years ago | |
| conf | 2 years ago | |
| doc | 2 years ago | |
| etc/init.d | 3 years ago | |
| gdb | 4 years ago | |
| ide/srs_clion | 2 years ago | |
| modules | 4 years ago | |
| packaging | 2 years ago | |
| research | 2 years ago | |
| scripts | 2 years ago | |
| src | 2 years ago | |
| usr/lib/systemd/system | 3 years ago | |
| .gitignore | 3 years ago | |
| AUTHORS.md | 2 years ago | |
| AUTHORS.txt | 4 years ago | |
| Dockerfile.builds | 2 years ago | |
| Dockerfile.cov | 2 years ago | |
| Dockerfile.pkg | 2 years ago | |
| Dockerfile.test | 2 years ago | |
| configure | 2 years ago | |