Browse Source

Merge branch 'next' of github.com:rtCamp/easyengine into next

old-stable
gau1991 10 years ago
parent
commit
f3b29cd9df
  1. 2
      src/lib/ee_lib_mysql_info.sh
  2. 2
      src/lib/ee_lib_nginx_info.sh
  3. 2
      src/lib/ee_lib_php_info.sh

2
src/lib/ee_lib_mysql_info.sh

@ -3,7 +3,7 @@
function ee_lib_mysql_info()
{
mysqladmin ping &>> $EE_COMMAND_LOG
if [ $? -ne 0 ]; then
if [ $? -eq 0 ]; then
local ee_mysql_version=$(mysql -V | awk '{print($5)}' | cut -d ',' -f1)
local ee_mysql_port=$(mysql -e "show variables" | grep ^port | awk '{print($2)}')
local ee_mysql_socket=$(mysql -e "show variables" | grep "^socket" | awk '{print($2)}')

2
src/lib/ee_lib_nginx_info.sh

@ -3,7 +3,7 @@
function ee_lib_nginx_info()
{
ee_lib_package_check $EE_NGINX_PACKAGE
if [ "$EE_PACKAGE_NAME" != "" ]; then
if [ "$EE_PACKAGE_NAME" = "" ]; then
local ee_nginx_version=$(nginx -v 2>&1 | cut -d':' -f2 | cut -d' ' -f2 | cut -d'/' -f2)
local ee_nginx_user=$(grep ^user /etc/nginx/nginx.conf | cut -d' ' -f2 | cut -d';' -f1)
local ee_nginx_processes=$(grep worker_processes /etc/nginx/nginx.conf | cut -d' ' -f2 | cut -d';' -f1)

2
src/lib/ee_lib_php_info.sh

@ -2,7 +2,7 @@
function ee_lib_php_info()
{
ee_lib_package_check php5-fpm
if [ "$EE_PACKAGE_NAME" != "" ]; then
if [ "$EE_PACKAGE_NAME" = "" ]; then
#Collect information from php.ini
local ee_php_version=$(php -v | head -n1 | cut -d' ' -f2 | cut -d'+' -f1)
local ee_php_memory=$(grep ^memory_limit /etc/php5/fpm/php.ini | awk '{print $3}')

Loading…
Cancel
Save