zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-20 18:01:08 +02:00
Code Issues Projects Releases Wiki Activity

minor logger fixes & more debug logging

Browse source
This commit is contained in:
Roman Arutyunyan 2013-05-13 13:35:56 +04:00
parent 849dbf6b89
commit aeb20d0a24
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ngx_rtmp_notify_module.c
View file

@ -1004,7 +1004,7 @@ ngx_rtmp_notify_publish_handle(ngx_rtmp_session_t *s,
goto next; goto next;
} }
if (ngx_strncmp(name, "rtmp://", 7)) { if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
*ngx_cpymem(v->name, name, rc) = 0; *ngx_cpymem(v->name, name, rc) = 0;
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"notify: publish redirect to '%s'", v->name); "notify: publish redirect to '%s'", v->name);
@ -1018,8 +1018,8 @@ ngx_rtmp_notify_publish_handle(ngx_rtmp_session_t *s,
*ngx_cpymem(v->name, name, rc) = 0; *ngx_cpymem(v->name, name, rc) = 0;
} }
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"notify: push '%s' to '%s'", v->name, name); "notify: push '%s' to '%*s'", v->name, rc, name);
local_name.data = v->name; local_name.data = v->name;
local_name.len = ngx_strlen(v->name); local_name.len = ngx_strlen(v->name);
@ -1083,7 +1083,7 @@ ngx_rtmp_notify_play_handle(ngx_rtmp_session_t *s,
goto next; goto next;
} }
if (ngx_strncmp(name, "rtmp://", 7)) { if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
*ngx_cpymem(v->name, name, rc) = 0; *ngx_cpymem(v->name, name, rc) = 0;
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"notify: play redirect to '%s'", v->name); "notify: play redirect to '%s'", v->name);
@ -1113,12 +1113,18 @@ ngx_rtmp_notify_play_handle(ngx_rtmp_session_t *s,
u->uri_part = 1; u->uri_part = 1;
u->no_resolve = 1; /* want ip here */ u->no_resolve = 1; /* want ip here */
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"notify: parse_url '%V'", &u->url);
if (ngx_parse_url(s->connection->pool, u) != NGX_OK) { if (ngx_parse_url(s->connection->pool, u) != NGX_OK) {
ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
"notify: pull failed '%V'", &local_name); "notify: pull failed '%V'", &local_name);
return NGX_ERROR; return NGX_ERROR;
} }
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"notify: naddrs=%ui", u->naddrs);
ngx_rtmp_relay_pull(s, &local_name, &target); ngx_rtmp_relay_pull(s, &local_name, &target);
next: next:

4
ngx_rtmp_relay_module.c
View file

@ -441,8 +441,8 @@ ngx_rtmp_relay_create_connection(ngx_rtmp_conf_ctx_t *cctx, ngx_str_t* name,
} }
if (target->url.naddrs == 0) { if (target->url.naddrs == 0) {
ngx_log_error(NGX_LOG_INFO, racf->log, 0, ngx_log_error(NGX_LOG_ERR, racf->log, 0,
"relay: no addresses"); "relay: no address");
goto clear; goto clear;
} }