diff --git a/.gitignore b/.gitignore index 941c33c41..9b0da8b39 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ __pycache__ # 环境变量 .env .env.test +.env.local # 源码结构 debug.txt diff --git a/docker/php/supervisord.conf b/docker/php/supervisord.conf index cbbb9aea7..cdb3e4821 100644 --- a/docker/php/supervisord.conf +++ b/docker/php/supervisord.conf @@ -8,18 +8,22 @@ pidfile=/var/run/supervisord.pid [program:php-fpm] command=php-fpm +directory=/var/www/html autostart=true autorestart=true startretries=3 startsecs=1 -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 +stopasgroup=true +killasgroup=true +stdout_logfile=/var/log/supervisor/php-fpm.log +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=10 +stderr_logfile=/var/log/supervisor/php-fpm-error.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=10 [program:think-cron] command=php /var/www/html/think cron:schedule -environment=APP_ENV=development process_name=%(program_name)s_%(process_num)02d numprocs=1 directory=/var/www/html diff --git a/src/.env.local b/src/.env.local deleted file mode 100644 index a90ac8794..000000000 --- a/src/.env.local +++ /dev/null @@ -1,22 +0,0 @@ -APP_DEBUG = true -APP_TRACE = true -[APP] -DEFAULT_TIMEZONE = Asia/Shanghai -[LANG] -default_lang = zh-cn -[DATABASE] -TYPE = mysql -HOSTNAME = newshop_mysql -DATABASE = shop_dev -USERNAME = shop_mallnew -PASSWORD = shop_mallnew -HOSTPORT = 3306 -CHARSET = utf8 -DEBUG = true -[RRDATABASE] -HOSTNAME = 192.168.2.64 -[redis] -HOST = newshop_redis -PORT = 6379 -PASSWORD = 'luckyshop123!@#' -EXPIRY = 604800 \ No newline at end of file