Skip to content

Commit

Permalink
Fix #1554, support logrotate copytruncate. 2.0.271
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jan 8, 2020
1 parent 459488b commit 731e878
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ Remark:

## History

* v2.0, 2020-01-08, Merge [#1554][bug #1554], support logrotate copytruncate. 2.0.271
* v2.0, 2020-01-05, Merge [#1551][bug #1551], fix memory leak in RTSP stack. 2.0.270
* v2.0, 2019-12-26, For [#1488][bug #1488], pass client ip to http callback. 2.0.269
* v2.0, 2019-12-23, Fix [srs-librtmp #22](https://github.com/ossrs/srs-librtmp/issues/22), parse vhost splited by single seperator. 2.0.268
Expand Down Expand Up @@ -1361,6 +1362,7 @@ Winlin
[bug #1304]: https://github.com/ossrs/srs/pull/1304
[bug #1488]: https://github.com/ossrs/srs/issues/1488
[bug #1551]: https://github.com/ossrs/srs/pull/1551
[bug #1554]: https://github.com/ossrs/srs/pull/1554
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx

[exo #828]: https://github.com/google/ExoPlayer/pull/828
Expand Down
9 changes: 1 addition & 8 deletions trunk/src/app/srs_app_log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,6 @@ void SrsFastLog::open_log_file()
return;
}

fd = ::open(filename.c_str(), O_RDWR | O_APPEND);

if(fd == -1 && errno == ENOENT) {
fd = open(filename.c_str(),
O_RDWR | O_CREAT | O_TRUNC | O_APPEND/*logrotate copytruncate need this flag*/,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
);
}
fd = ::open(filename.c_str(), O_RDWR | O_CREAT | O_APPEND);
}

2 changes: 1 addition & 1 deletion trunk/src/core/srs_core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 270
#define VERSION_REVISION 271

// generated by configure, only macros.
#include <srs_auto_headers.hpp>
Expand Down

0 comments on commit 731e878

Please sign in to comment.