Skip to content

Added logging for streams based on port #5114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shotz5 wants to merge 1 commit into
base: develop
Choose a base branch
from
+19 −7
Open

Added logging for streams based on port #5114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion backend/templates/stream.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ server {

proxy_pass {{ forwarding_host }}:{{ forwarding_port }};

access_log /data/logs/stream-{{ id }}_access.log stream;
error_log /data/logs/stream-{{ id }}_error.log warn;

# Custom
include /data/nginx/custom/server_stream[.]conf;
include /data/nginx/custom/server_stream_tcp[.]conf;
Expand All @@ -25,9 +28,12 @@ server {

proxy_pass {{ forwarding_host }}:{{ forwarding_port }};

access_log /data/logs/stream-{{ id }}_access.log stream;
error_log /data/logs/stream-{{ id }}_error.log warn;

# Custom
include /data/nginx/custom/server_stream[.]conf;
include /data/nginx/custom/server_stream_udp[.]conf;
}
{% endif %}
{% endif %}
{% endif %}
6 changes: 3 additions & 3 deletions docker/rootfs/etc/nginx/conf.d/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ server {
set $port "80";

server_name localhost-nginx-proxy-manager;
access_log /data/logs/fallback_access.log standard;
error_log /data/logs/fallback_error.log warn;
access_log /data/logs/fallback_http_access.log standard;
error_log /data/logs/fallback_http_error.log warn;
include conf.d/include/assets.conf;
include conf.d/include/block-exploits.conf;
include conf.d/include/letsencrypt-acme-challenge.conf;
Expand All @@ -30,7 +30,7 @@ server {
set $port "443";

server_name localhost;
access_log /data/logs/fallback_access.log standard;
access_log /data/logs/fallback_http_access.log standard;
error_log /dev/null crit;
include conf.d/include/ssl-ciphers.conf;
ssl_reject_handshake on;
Expand Down
2 changes: 1 addition & 1 deletion .../rootfs/etc/nginx/conf.d/include/log.conf → ...s/etc/nginx/conf.d/include/log-proxy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
log_format proxy '[$time_local] $upstream_cache_status $upstream_status $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] [Sent-to $server] "$http_user_agent" "$http_referer"';
log_format standard '[$time_local] $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] "$http_user_agent" "$http_referer"';

access_log /data/logs/fallback_access.log proxy;
access_log /data/logs/fallback_http_access.log proxy;
3 changes: 3 additions & 0 deletions docker/rootfs/etc/nginx/conf.d/include/log-stream.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
log_format stream '[$time_local] [Client $remote_addr:$remote_port] $protocol $status $bytes_sent $bytes_received $session_time [Sent-to $upstream_addr] [Sent $upstream_bytes_sent] [Received $upstream_bytes_received] [Time $upstream_connect_time] $ssl_protocol $ssl_cipher';

access_log /data/logs/fallback_stream_access.log stream;
5 changes: 4 additions & 1 deletion docker/rootfs/etc/nginx/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ http {
proxy_cache_path /var/lib/nginx/cache/private levels=1:2 keys_zone=private-cache:5m max_size=1024m;

# Log format and fallback log file
include /etc/nginx/conf.d/include/log.conf;
include /etc/nginx/conf.d/include/log-proxy.conf;

# Dynamically generated resolvers file
include /etc/nginx/conf.d/include/resolvers.conf;
Expand Down Expand Up @@ -85,6 +85,9 @@ http {
}

stream {
# Log format and fallback log file
include /etc/nginx/conf.d/include/log-stream.conf;

# Files generated by NPM
include /data/nginx/stream/*.conf;

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/locale/src/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
"column.provider": {
"defaultMessage": "공급자"
},
"column.roles": {
"column.roles": {
"defaultMessage": "권한"
},
"column.rules": {
Expand Down