Skip to content

Commit

Permalink
feat: debug mod
Browse files Browse the repository at this point in the history
  • Loading branch information
DDSRem committed May 1, 2023
1 parent a6e9b4f commit 16cb676
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 13 deletions.
12 changes: 10 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENV S6_SERVICES_GRACETIME=30000 \
HOME="/root" \
TERM="xterm" \
PATH=${PATH}:/command \
DEBUG=false \
TZ="Asia/Shanghai" \
PUID=0 \
PGID=0
Expand Down Expand Up @@ -57,11 +58,18 @@ RUN set -ex && \
sed -i "s#;opcache.revalidate_freq=2#opcache.revalidate_freq=60#g" /etc/php/7.4/fpm/php.ini /etc/php/7.4/cli/php.ini && \
sed -i "s#;opcache.validate_timestamps=1#opcache.validate_timestamps=0#g" /etc/php/7.4/fpm/php.ini /etc/php/7.4/cli/php.ini && \
sed -i "s#;opcache.lockfile_path=/tmp#opcache.lockfile_path=/tmp#g" /etc/php/7.4/fpm/php.ini /etc/php/7.4/cli/php.ini && \
# Set php pid
mkdir /run/php && \
# Set user
usermod www-data --home /app/web && \
# Set logs
sed -i "s#;error_log = php_errors.log#error_log = /logs/php_errors.log#g" /etc/php/7.4/fpm/php.ini /etc/php/7.4/cli/php.ini && \
mkdir /logs && \
#ln -sf /var/log/nginx/access.log /logs/nginx_access.log && \
ln -sf /var/log/nginx/error.log /logs/nginx_error.log && \
touch /logs/nginx_access.log && \
touch /logs/nginx_error.log && \
touch /logs/php7.4-fpm.log && \
touch /logs/php_errors.log && \
# Clear
apt-get autoremove -y && \
apt-get clean && \
rm -rf \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/020-fixuser
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function 020_fixuser {
groupmod -o -g "${PGID}" www-data
usermod -o -u "${PUID}" www-data

chown www-data:www-data -R /app/web
chown www-data:www-data -R /app/web /logs
chmod 755 -R /app/web

}
Expand Down
4 changes: 2 additions & 2 deletions rootfs/etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ http {
# Logging Settings
##

access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
access_log /logs/nginx_access.log;
error_log /logs/nginx_error.log;

##
# Gzip Settings
Expand Down
145 changes: 145 additions & 0 deletions rootfs/etc/php/7.4/fpm/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
;;;;;;;;;;;;;;;;;;;;;
; FPM Configuration ;
;;;;;;;;;;;;;;;;;;;;;

; All relative paths in this configuration file are relative to PHP's install
; prefix (/usr). This prefix can be dynamically changed by using the
; '-p' argument from the command line.

;;;;;;;;;;;;;;;;;;
; Global Options ;
;;;;;;;;;;;;;;;;;;

[global]
; Pid file
; Note: the default prefix is /var
; Default Value: none
; Warning: if you change the value here, you need to modify systemd
; service PIDFile= setting to match the value here.
pid = /run/php/php7.4-fpm.pid

; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
; into a local file.
; Note: the default prefix is /var
; Default Value: log/php-fpm.log
error_log = /logs/php7.4-fpm.log

; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
; will be handled differently.
; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
; Default Value: daemon
;syslog.facility = daemon

; syslog_ident is prepended to every message. If you have multiple FPM
; instances running on the same server, you can change the default value
; which must suit common needs.
; Default Value: php-fpm
;syslog.ident = php-fpm

; Log level
; Possible Values: alert, error, warning, notice, debug
; Default Value: notice
;log_level = notice

; Log limit on number of characters in the single line (log entry). If the
; line is over the limit, it is wrapped on multiple lines. The limit is for
; all logged characters including message prefix and suffix if present. However
; the new line character does not count into it as it is present only when
; logging to a file descriptor. It means the new line character is not present
; when logging to syslog.
; Default Value: 1024
;log_limit = 4096

; Log buffering specifies if the log line is buffered which means that the
; line is written in a single write operation. If the value is false, then the
; data is written directly into the file descriptor. It is an experimental
; option that can potentionaly improve logging performance and memory usage
; for some heavy logging scenarios. This option is ignored if logging to syslog
; as it has to be always buffered.
; Default value: yes
;log_buffering = no

; If this number of child processes exit with SIGSEGV or SIGBUS within the time
; interval set by emergency_restart_interval then FPM will restart. A value
; of '0' means 'Off'.
; Default Value: 0
;emergency_restart_threshold = 0

; Interval of time used by emergency_restart_interval to determine when
; a graceful restart will be initiated. This can be useful to work around
; accidental corruptions in an accelerator's shared memory.
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;emergency_restart_interval = 0

; Time limit for child processes to wait for a reaction on signals from master.
; Available units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;process_control_timeout = 0

; The maximum number of processes FPM will fork. This has been designed to control
; the global number of processes when using dynamic PM within a lot of pools.
; Use it with caution.
; Note: A value of 0 indicates no limit
; Default Value: 0
; process.max = 128

; Specify the nice(2) priority to apply to the master process (only if set)
; The value can vary from -19 (highest priority) to 20 (lowest priority)
; Note: - It will only work if the FPM master process is launched as root
; - The pool process will inherit the master process priority
; unless specified otherwise
; Default Value: no set
; process.priority = -19

; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
; Default Value: yes
;daemonize = yes

; Set open file descriptor rlimit for the master process.
; Default Value: system defined value
;rlimit_files = 1024

; Set max core size rlimit for the master process.
; Possible Values: 'unlimited' or an integer greater or equal to 0
; Default Value: system defined value
;rlimit_core = 0

; Specify the event mechanism FPM will use. The following is available:
; - select (any POSIX os)
; - poll (any POSIX os)
; - epoll (linux >= 2.5.44)
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
; - /dev/poll (Solaris >= 7)
; - port (Solaris >= 10)
; Default Value: not set (auto detection)
;events.mechanism = epoll

; When FPM is built with systemd integration, specify the interval,
; in seconds, between health report notification to systemd.
; Set to 0 to disable.
; Available Units: s(econds), m(inutes), h(ours)
; Default Unit: seconds
; Default value: 10
;systemd_interval = 10

;;;;;;;;;;;;;;;;;;;;
; Pool Definitions ;
;;;;;;;;;;;;;;;;;;;;

; Multiple pools of child processes may be started with different listening
; ports and different management options. The name of the pool will be
; used in logs and stats. There is no limitation on the number of pools which
; FPM can handle. Your system will tell you anyway :)

; Include one or more files. If glob(3) exists, it is used to include a bunch of
; files from a glob(3) pattern. This directive can be used everywhere in the
; file.
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
; - /usr otherwise
include=/etc/php/7.4/fpm/pool.d/*.conf
2 changes: 1 addition & 1 deletion rootfs/etc/php/7.4/fpm/pool.d/www.conf
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ pm.max_spare_servers = 3
; Note: on highloaded environement, this can cause some delay in the page
; process time (several ms).
; Default Value: no
;catch_workers_output = yes
catch_workers_output = yes

; Decorate worker output with prefix and suffix containing information about
; the child that writes to the log and if stdout or stderr is used as well as
Expand Down
7 changes: 0 additions & 7 deletions rootfs/etc/services.d/log/run

This file was deleted.

11 changes: 11 additions & 0 deletions rootfs/etc/services.d/logs_out/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

if [[ "${DEBUG}" == true ]]; then
LOG_OUT_COMMAND="tail -f /logs/*.log"
else
LOG_OUT_COMMAND="tail -f /dev/null"
fi

exec s6-setuidgid root \
${LOG_OUT_COMMAND}

0 comments on commit 16cb676

Please sign in to comment.