Skip to content

Commit ae7e9ea

Browse files
im-pingoim-pingo
committed
add update for metadta notify
1 parent ac89b92 commit ae7e9ea

File tree

20 files changed

+189
-238
lines changed

20 files changed

+189
-238
lines changed

‎docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ WORKDIR ${RUN_PATH}
2323

2424
ENV DEBIAN_FRONTEND=noninteractive
2525
RUN apt update && apt-get upgrade -y && \
26-
apt-get install -y supervisor ffmpeg openssl build-essential libtool libpcre3 libpcre3-dev zlib1g-dev libssl-dev
26+
apt-get install -y supervisor ffmpeg openssl libpcre3 libpcre3-dev zlib1g-dev libssl-dev
2727

2828
#RUN rm -f /etc/supervisor/supervisord.conf
2929
ENV PATH=${PATH}:${RUN_PATH}/sbin
@@ -33,7 +33,7 @@ COPY --from=build ${BUILD_PATH}/docker/supervisor/supervisord.conf /etc/supervis
3333
COPY --from=build ${BUILD_PATH}/docker/supervisor/pingos.conf /etc/supervisor/conf.d/pingos.conf
3434
COPY --from=build ${BUILD_PATH}/docker/pingos-entrypoint.sh /usr/local/bin/pingos-entrypoint.sh
3535

36+
RUN mkdir -p /data/record && mkdir -p /usr/local/pingos/conf/conf.d/location && mkdir -p /usr/local/pingos/conf/conf.d/server
3637
RUN chmod 777 /usr/local/bin/pingos-entrypoint.sh
3738

3839
CMD [ "/usr/bin/supervisord" ]
39-

‎docker/conf/nginx-clip.conf‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
user root;
22
daemon off;
33
master_process on;
4-
worker_processes 1;
4+
worker_processes auto;
55
#worker_rlimit 4g;
66

77
#error_log logs/error.log;
88
#error_log logs/error.log notice;
9-
error_log logs/error.log error;
9+
error_log logs/error.log info;
1010

1111
worker_rlimit_nofile 102400;
1212
worker_rlimit_core 2G;
@@ -16,7 +16,7 @@ pid logs/nginx.pid;
1616

1717
events {
1818
use epoll;
19-
worker_connections 4096;
19+
worker_connections 65535;
2020
multi_listen unix:/tmp/http 80;
2121
multi_listen unix:/tmp/https 443;
2222
multi_listen unix:/tmp/rtmp 1935;
@@ -39,7 +39,7 @@ rtmp {
3939
server {
4040
listen 1935 so_keepalive=2s:2s:3;
4141
serverid edge;
42-
out_queue 2048;
42+
out_queue 10240;
4343
rtmp_auto_pull on;
4444
rtmp_auto_pull_port unix:/tmp/rtmp;
4545
timeout 5s;
@@ -85,11 +85,14 @@ http {
8585
#reset_server_name www.test1.com www.test2.com;
8686
#gzip on;
8787

88+
include /usr/local/pingos/conf/conf.d/server/*.conf;
89+
8890
server {
8991
listen 80;
9092
listen 443 ssl;
9193
ssl_certificate /cert/fullchain.pem;
9294
ssl_certificate_key /cert/privkey.pem;
95+
include /usr/local/pingos/conf/conf.d/location/*.conf;
9396
chunked_transfer_encoding off;
9497

9598
location /rtmp_stat {
@@ -117,22 +120,13 @@ http {
117120
return 200;
118121
}
119122

120-
location ~ .mp4$ {
121-
root html;
122-
#mp4;
123-
}
124-
125123
location /control {
126124
rtmp_control all;
127125
}
128126

129127
location /flv {
130128
flv_live 1935;
131-
add_header 'Access-Control-Allow-Origin' '*';
132-
add_header "Access-Control-Allow-Credentials" "true";
133-
add_header "Access-Control-Allow-Methods" "*";
134-
add_header "Access-Control-Allow-Headers" "Content-Type,Access-Token";
135-
add_header "Access-Control-Expose-Headers" "*";
129+
chunked_transfer_encoding off;
136130
}
137131

138132
location /ts {

‎docker/conf/nginx-core.conf‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
user root;
22
daemon off;
33
master_process on;
4-
worker_processes 1;
4+
worker_processes auto;
55
#worker_rlimit 4g;
66

77
#error_log logs/error.log;
88
#error_log logs/error.log notice;
9-
error_log logs/error.log error;
9+
error_log logs/error.log info;
1010

1111
worker_rlimit_nofile 102400;
1212
worker_rlimit_core 2G;
@@ -16,7 +16,7 @@ pid logs/nginx.pid;
1616

1717
events {
1818
use epoll;
19-
worker_connections 4096;
19+
worker_connections 65535;
2020
multi_listen unix:/tmp/http 80;
2121
multi_listen unix:/tmp/https 443;
2222
multi_listen unix:/tmp/rtmp 1935;
@@ -39,21 +39,21 @@ rtmp {
3939
server {
4040
listen 1935 so_keepalive=2s:2s:3;
4141
serverid live;
42-
out_queue 2048;
42+
out_queue 10240;
4343
rtmp_auto_pull on;
4444
rtmp_auto_pull_port unix:/tmp/rtmp;
4545
timeout 5s;
4646
max_message 6291456;
4747
idle_streams off;
4848

4949
application audio {
50-
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&silent=1&$pargs;
51-
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&silent=1&$pargs;
52-
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
53-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
54-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
55-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
56-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=hls&$pargs;
50+
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&silent=1&$pargs;
51+
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&silent=1&$pargs;
52+
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
53+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
54+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
55+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
56+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=hls&$pargs;
5757

5858
hls off;
5959
hls_path /tmp/hls;
@@ -81,13 +81,13 @@ rtmp {
8181
}
8282

8383
application * {
84-
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&silent=1&$pargs;
85-
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&silent=1&$pargs;
86-
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
87-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
88-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
89-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
90-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=hls&$pargs;
84+
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s timeout=5s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&silent=1&$pargs;
85+
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&silent=1&$pargs;
86+
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
87+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
88+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
89+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
90+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=hls&$pargs;
9191

9292
live_record off;
9393
live_record_path /data/record;
@@ -138,11 +138,15 @@ http {
138138
#reset_server_name www.test1.com www.test2.com;
139139
#gzip on;
140140

141+
142+
include /usr/local/pingos/conf/conf.d/server/*.conf;
143+
141144
server {
142145
listen 80;
143146
listen 443 ssl;
144147
ssl_certificate /cert/fullchain.pem;
145148
ssl_certificate_key /cert/privkey.pem;
149+
include /usr/local/pingos/conf/conf.d/location/*.conf;
146150
location /rtmp_stat {
147151
rtmp_stat all;
148152
rtmp_stat_stylesheet /stat.xsl;
@@ -163,27 +167,17 @@ http {
163167

164168
location /bs {
165169
broadcast unix:/tmp/http /proxy;
166-
broadcast_rewrite_prefix "," [;
170+
broadcast_rewrite_prefix " " "[";
167171
broadcast_suffix ];
168172
return 200;
169173
}
170174

171-
location ~ .mp4$ {
172-
root html;
173-
#mp4;
174-
}
175-
176175
location /control {
177176
rtmp_control all;
178177
}
179178
location /flv {
180179
flv_live 1935;
181180
chunked_transfer_encoding off;
182-
add_header 'Access-Control-Allow-Origin' '*';
183-
add_header "Access-Control-Allow-Credentials" "true";
184-
add_header "Access-Control-Allow-Methods" "*";
185-
add_header "Access-Control-Allow-Headers" "Content-Type,Access-Token";
186-
add_header "Access-Control-Expose-Headers" "*";
187181
}
188182
location /ts {
189183
ts_live 1935 app=live;

‎docker/conf/nginx-edge.conf‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
user root;
22
daemon off;
33
master_process on;
4-
worker_processes 1;
4+
worker_processes auto;
55
#worker_rlimit 4g;
66

77
#error_log logs/error.log;
88
#error_log logs/error.log notice;
9-
error_log logs/error.log error;
9+
error_log logs/error.log info;
1010

1111
worker_rlimit_nofile 102400;
1212
worker_rlimit_core 2G;
@@ -16,7 +16,7 @@ pid logs/nginx.pid;
1616

1717
events {
1818
use epoll;
19-
worker_connections 4096;
19+
worker_connections 65535;
2020
multi_listen unix:/tmp/http 80;
2121
multi_listen unix:/tmp/https 443;
2222
multi_listen unix:/tmp/rtmp 1935;
@@ -39,20 +39,20 @@ rtmp {
3939
server {
4040
listen 1935 so_keepalive=2s:2s:3;
4141
serverid edge;
42-
out_queue 2048;
42+
out_queue 10240;
4343
rtmp_auto_pull on;
4444
rtmp_auto_pull_port unix:/tmp/rtmp;
4545
timeout 5s;
4646
idle_streams off;
4747
max_message 6291456;
4848

4949
application audio {
50-
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&$pargs;
51-
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
52-
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
53-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
54-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
55-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
50+
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&$pargs;
51+
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
52+
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
53+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
54+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
55+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
5656

5757
hls2 off;
5858
mpegts_cache_time 0s;
@@ -73,12 +73,12 @@ rtmp {
7373
}
7474

7575
application * {
76-
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&$pargs;
77-
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
78-
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
79-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
80-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
81-
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
76+
on_play http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clietip=$remote_addr&$pargs;
77+
on_publish http://127.0.0.1:6080/v1/live/notify stage=start,update,done update=10s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
78+
on_pull http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&$pargs;
79+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=push&$pargs;
80+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=record&$pargs;
81+
on_push http://127.0.0.1:6080/v1/live/notify stage=start,done update=30s timeout=5s args=serverid=$serverid&scheme=$scheme&clientip=$remote_addr&invoke=transcode&$pargs;
8282

8383
live_record off;
8484
live_record_path /data/record;
@@ -121,11 +121,15 @@ http {
121121
#reset_server_name www.test1.com www.test2.com;
122122
#gzip on;
123123

124+
125+
include /usr/local/pingos/conf/conf.d/server/*.conf;
126+
124127
server {
125128
listen 80;
126129
listen 443 ssl;
127130
ssl_certificate /cert/fullchain.pem;
128131
ssl_certificate_key /cert/privkey.pem;
132+
include /usr/local/pingos/conf/conf.d/location/*.conf;
129133
chunked_transfer_encoding off;
130134

131135
location /rtmp_stat {
@@ -153,22 +157,13 @@ http {
153157
return 200;
154158
}
155159

156-
location ~ .mp4$ {
157-
root html;
158-
#mp4;
159-
}
160-
161160
location /control {
162161
rtmp_control all;
163162
}
164163

165164
location /flv {
166165
flv_live 1935;
167-
add_header 'Access-Control-Allow-Origin' '*';
168-
add_header "Access-Control-Allow-Credentials" "true";
169-
add_header "Access-Control-Allow-Methods" "*";
170-
add_header "Access-Control-Allow-Headers" "Content-Type,Access-Token";
171-
add_header "Access-Control-Expose-Headers" "*";
166+
chunked_transfer_encoding off;
172167
}
173168

174169
location /ts {

0 commit comments

Comments
 (0)