mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-05-18 17:21:08 +02:00
added fcntl-style file lock in recorder
This commit is contained in:
parent
406d3a9527
commit
9b3471d79f
|
@ -89,6 +89,14 @@ static ngx_command_t ngx_rtmp_record_commands[] = {
|
|||
offsetof(ngx_rtmp_record_app_conf_t, unique),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("record_lock"),
|
||||
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
|
||||
NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
|
||||
ngx_conf_set_flag_slot,
|
||||
NGX_RTMP_APP_CONF_OFFSET,
|
||||
offsetof(ngx_rtmp_record_app_conf_t, lock_file),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("record_max_size"),
|
||||
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
|
||||
NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
|
||||
|
@ -176,6 +184,7 @@ ngx_rtmp_record_create_app_conf(ngx_conf_t *cf)
|
|||
racf->max_frames = NGX_CONF_UNSET;
|
||||
racf->interval = NGX_CONF_UNSET;
|
||||
racf->unique = NGX_CONF_UNSET;
|
||||
racf->lock_file = NGX_CONF_UNSET;
|
||||
racf->notify = NGX_CONF_UNSET;
|
||||
racf->url = NGX_CONF_UNSET_PTR;
|
||||
|
||||
|
@ -199,6 +208,7 @@ ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
ngx_conf_merge_size_value(conf->max_size, prev->max_size, 0);
|
||||
ngx_conf_merge_size_value(conf->max_frames, prev->max_frames, 0);
|
||||
ngx_conf_merge_value(conf->unique, prev->unique, 0);
|
||||
ngx_conf_merge_value(conf->lock_file, prev->lock_file, 0);
|
||||
ngx_conf_merge_value(conf->notify, prev->notify, 0);
|
||||
ngx_conf_merge_msec_value(conf->interval, prev->interval,
|
||||
(ngx_msec_t) NGX_CONF_UNSET);
|
||||
|
@ -448,6 +458,14 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
|
|||
return NGX_OK;
|
||||
}
|
||||
|
||||
if (rracf->lock_file) {
|
||||
err = ngx_lock_fd(rctx->file.fd);
|
||||
if (err) {
|
||||
ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
|
||||
"record: %V lock failed", &rracf->id);
|
||||
}
|
||||
}
|
||||
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"record: %V opened '%V'", &rracf->id, &path);
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@ typedef struct {
|
|||
ngx_msec_t interval;
|
||||
ngx_str_t suffix;
|
||||
ngx_flag_t unique;
|
||||
ngx_flag_t lock_file;
|
||||
ngx_flag_t notify;
|
||||
ngx_url_t *url;
|
||||
|
||||
|
|
Loading…
Reference in a new issue