Merge remote-tracking branch 'swoole/master' into memcache-support

Author: bukn

.travis.yml

@@ -0,0 +1,85 @@
+sudo: required
+
+language: c
+
+matrix:
+    include:
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "7.1"
+              - PHP_INSTALL_VERSION: "7.1.1"
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "7.0"
+              - PHP_INSTALL_VERSION: "7.0.15"
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "5.6"
+              - PHP_INSTALL_VERSION: "5.6.30"
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "5.5"
+              - PHP_INSTALL_VERSION: "5.5.38"
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "5.4"
+              - PHP_INSTALL_VERSION: "5.4.45"
+        - os: linux
+          dist: trusty
+          env:
+              - PHP_VERSION_MAJOR: "5.3"
+              - PHP_INSTALL_VERSION: "5.3.29"
+addons:
+    apt:
+        packages: build-essential
+
+before_install:
+    # build PHP without ZTS
+    - export CP_PATH=`pwd`
+    - sudo apt-get install -qqy curl libcurl3-openssl-dev libxslt1-dev re2c libxml2 libxml2-dev bison libbz2-dev libreadline-dev libedit-dev libpng12-0 libpng12-dev libjpeg-dev libjpeg8-dev libjpeg8  libgd-dev libgd3 libssl-dev openssl gettext libicu-dev libmhash-dev libmhash2 libmcrypt-dev libmcrypt4 uuid-dev
+    - ${CP_PATH}/.travis/php_download.sh ${PHP_INSTALL_VERSION}
+    - export PHP_BUILD_CONF="--with-libedit --with-pear --enable-fpm --enable-mbstring --with-pcre-dir --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-openssl --with-curl --enable-zip --enable-sockets --enable-bcmath --enable-calendar --enable-ftp --disable-intl --enable-mbstring --enable-pcntl"
+    - ${CP_PATH}/.travis/php_install.sh "${CP_PATH}" php-${PHP_INSTALL_VERSION}.tar.gz "$PHP_BUILD_CONF"
+    - export PHP_PATH=${CP_PATH}/php-${PHP_INSTALL_VERSION}
+    - export PHP_BIN_DIR=${PHP_PATH}/bin
+    - export PATH="${PHP_BIN_DIR}:${PATH}"
+    - export PHP_BIN=${PHP_BIN_DIR}/php
+
+install:
+  - sudo mkdir -m 777 /var/log/php-connection-pool
+  - chmod +x ${CP_PATH}/pool_server ${CP_PATH}/initd-php-connection-pool
+  - sudo cp ${CP_PATH}/pool_server /usr/local/bin/pool_server
+  - sudo cp ${CP_PATH}/config.ini.example /etc/pool.ini
+  - ${CP_PATH}/.travis/php_install_ext.sh "${CP_PATH}" "${PHP_PATH}"
+  - echo 'extension = connect_pool.so' > ${PHP_PATH}/config/conf.d/connect_pool.ini
+  - if [ ! -f /bin/env ];then sudo ln -s /usr/bin/env /bin/env; fi
+
+before_script:
+  - $PHP_BIN -m | grep -s connect_pool
+  - sudo mkdir -m 777 /var/run/cp
+  - sudo touch /var/run/php_connection_pool.pid && sudo chmod 777 /var/run/php_connection_pool.pid
+  - ${CP_PATH}/pool_server start
+
+script:
+    - netstat -tlnp |grep 6253
+    - ${CP_PATH}/pool_server status
+    - env TEST_PHP_EXECUTABLE=$PHP_BIN $PHP_BIN -c "${PHP_PATH}/config/php.ini" "${PHP_PATH}/run-tests.php" "${CP_PATH}/tests" |tee /tmp/php_cp_test.result && fail_num=$(grep -o -E "Tests\s+failed\s*:\s*[0-9]{1,}\s*\(" /tmp/php_cp_test.result |grep -o -E "[0-9]{1,}" -) && echo $fail_num && [ "$fail_num"=="0" ]
+
+after_success: true
+
+after_failure: true
+
+after_script: true
+
+notifications:
+    email:
+        recipients:
+          - [email protected]
+          #- [email protected]
+        on_success: change
+        on_failure: always

.travis/php_download.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+function log_download()
+{
+    echo "[download_php] $@" 1>&2
+}
+
+function download_php()
+{
+    url="$1"
+    tar="$2"
+
+    wget -t3 -T3 -O "${tar}.tmp" "${url}"
+
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        mv -f ${tar}.tmp $tar
+        log_download "done $tar"
+    else
+        rm -f ${tar}.tmp
+        log_download "fail"
+    fi
+
+    return $ret
+}
+
+
+# main
+if [ -z "$1" ]; then
+    echo "usage: `basename $0` <ver.si.on>"
+    exit 1
+fi
+version="$1"
+log_download "version: $version"
+
+# choose source
+tar_file="php-${version}.tar.gz"
+url="https://secure.php.net/get/${tar_file}/from/this/mirror"
+
+# download
+log_download "download from $url"
+download_php "$url" "$tar_file"

.travis/php_install.sh

@@ -0,0 +1,95 @@
+#!/bin/bash
+function log_install()
+{
+    echo "[install_php] $@" 1>&2
+}
+
+function install_php_from_tar()
+{
+    tar="$2"
+    src=`echo $tar | sed 's/^.*\/\?\(php-[0-9]\+\.[0-9]\+\.[0-9]\+\)\.tar\.gz$/\1/'`
+    if [ -z "$src" ]; then
+        return 1
+    fi
+
+    # prepare normal
+    log_install "extract tar ball"
+    rm -fr $src && tar zxf $tar
+
+    # build
+    echo "tar:"$3
+    install_php $1 $src "$3"
+}
+
+function install_php()
+{
+    # init
+    prefix=$1
+    src=$2
+    param_extra=$3
+    echo "build:"$3
+    echo $param_extra
+
+    # version related
+    version=`grep ' PHP_VERSION ' $src/main/php_version.h | sed 's/^#define PHP_VERSION "\([0-9a-zA-Z\.]\+\)".*$/\1/'`
+    buildname="php-${version}"
+    log_install "[$buildname] build"
+
+    cd $src
+
+    # prepare
+    #param_general="--disable-all"
+    conf_dir="${prefix}/${buildname}/config"
+    conf_ext_dir="${conf_dir}/conf.d"
+    [ ! -d "$conf_ext_dir" ] && mkdir -p -m 755 "$conf_ext_dir"
+    cp "${prefix}/${buildname}/php.ini-production" "${conf_dir}/php.ini"
+
+    param_general="--with-config-file-scan-dir=${conf_dir} --sysconfdir=${conf_dir} --with-config-file-path=${conf_dir}/php.ini --with-config-file-scan-dir=${conf_ext_dir}"
+    param_sapi="--enable-cli --disable-cgi"
+    cmd="./configure --quiet --prefix=${prefix}/${buildname} $param_general $param_sapi $param_extra"
+
+    # configure
+    log_install "[$buildname] configure"
+    log_install "$cmd"
+    $cmd
+
+    log_install "[$buildname] make"
+    # NOT DO a meaningless "make clean"! it's just extracted
+    make --quiet && \
+        make install
+    ret=$?
+
+    if [ $ret -eq 0 ]; then
+        log_install "[$buildname] done"
+    else
+        log_install "[$buildname] fail"
+    fi
+    cd "${CP_PATH}"
+}
+
+# main
+if [ $# -lt 2 ]; then
+    echo "usage: `basename $0` <prefix> <php-tarfile>"
+    exit 1
+fi
+
+# argument
+prefix="$1"
+if [ ! -d "$prefix" ]; then
+    log_install "error: invalid prefix \"$prefix\""
+    exit 1
+fi
+log_install "prefix: $prefix"
+tarfile="$2"
+if [ ! -f "$tarfile" ]; then
+    log_install "error: invalid PHP tar file \"$tarfile\""
+    exit 1
+fi
+log_install "tarfile: $tarfile"
+
+extra_param="$3"
+echo "main:${extra_param}"
+[ -n "$extra_param" ] && log_install "extra param: ${extra_param}"
+
+# install
+install_php_from_tar $prefix $tarfile "$extra_param"

.travis/php_install_ext.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+function log_ext()
+{
+    echo "[install_ext] $@" 1>&2
+}
+
+function install_ext()
+{
+    php_path="$2"
+    php="$php_path/bin/php"
+    phpize="$php_path/bin/phpize"
+    phpcfg="$php_path/bin/php-config"
+    if [ ! -f $phpcfg ]; then
+        log_ext "invalid PHP path $php_path"
+        return 1
+    fi
+
+    # change to extension path
+    cd $1
+
+    log_ext "ext_path: ${1}"
+    log_ext "php_path: ${php_path}"
+    log_ext "current_path: `pwd`"
+
+    # configure, make
+    $phpize && ./configure --with-php-config=$phpcfg && make install
+    ret=$?
+
+    if [ $ret -eq 0 ]; then
+        log_ext "done"
+    else
+        log_ext "fail"
+    fi
+    cd "${CP_PATH}"
+
+    return $ret
+}
+
+# main
+if [ $# -ne 2 ]; then
+    echo "usage: `basename $0` <extension-path> <php-path>"
+    exit 1
+fi
+
+# argument
+ext_path="$1"
+if [ ! -d "$ext_path" ]; then
+    log_ext "error: invalid extension-path \"$ext_path\""
+    exit 1
+fi
+log_ext "ext_path: $ext_path"
+php_path="$2"
+if [ ! -d "$php_path" ]; then
+    log_ext "error: invalid PHP path \"$php_path\""
+    exit 1
+fi
+log_ext "php_path: $php_path"
+
+# build
+install_ext $ext_path $php_path

README.md

@@ -1,4 +1,5 @@
-## php-cp(php-connect-pool),redis和pdo的本地代理
+## php-cp(php-connect-pool),redis和pdo的本地代理 [![Build Status](https://secure.travis-ci.org/swoole/php-cp.svg?branch=master)](http://travis-ci.org/swoole/php-cp)
+
 [中文简介] http://blog.sina.com.cn/s/blog_9eaa0f400102v9fd.html
 
 提供连接池，读写分离，负载均衡，慢查询日志，大数据块日志等功能
@@ -9,16 +10,12 @@
 - linux 2.6+
 - pdo and redis extension install
 
-## 安装
-
-+ `phpize && ./configure && make install`
-+ `echo "extension=xx/connect_pool.so" >> php.ini`
 
 ## 使用Docker安装
 
 可以使用Docker编译，需要在项目的根目录下运行:
 
-1. 根据自己的配置，复制 `php.ini.example` 文件为 `php.ini` 文件，修改 `pool.ini` 文件
+1. 根据自己的配置，复制 `pool.ini.example` 文件为 `pool.ini` 文件，修改 `pool.ini` 文件
 2. `docker build -t php-cp .`
 
 
@@ -51,12 +48,23 @@ pdoProxy和原生Pdo不一样的一点是 默认pdo是静默模式 不抛异常
 - thinkphp 请参考 http://git.oschina.net/xavier007/THINKPHP_phpcp_driver
 - discuz 请参考 https://github.com/xluohome/php-cp-for-discuz
 
-## 使用
-* 将项目中的pool.ini文件mv到/etc/pool.ini,并根据需求修改配置文件
+## 安装使用
+* 安装扩展 安装步骤跟其它PHP扩展无差别
+
+```
+$ phpize && ./configure && make && make install //如果报phpize命令找不到请安装php-devel包
+$ echo "extension=connect_pool.so" >> php.ini
+//如果PHP启用了目录配置 上一步骤可以换为下面的方式 配置目录可以通过 php --info|grep 'Scan'获取
+$ echo "extension=connect_pool.so" > /etc/php.d/20-connection_pool.ini
+```
+
+* 初始化配置(一次性)
 ```
-$ mv ./pool.ini.example /etc/pool.ini
-$ chmod +x ./pool_server //pool_server为php脚本 可自行修改
-$ mv pool_server /usr/local/bin/
+$ cp ./pool.ini.example /etc/pool.ini //根据需求修改配置内容
+$ mkdir -m 755 /var/log/php-connection-pool //创建日志目录 目录文件夹不存在或没权限会导致日志写不起
+$ chmod +x ./pool_server //x权限git已经设置 为稳妥再设置一次 pool_server为php脚本 可自行修改
+$ [ -f /bin/env ] || sudo ln -s /usr/bin/env /bin/env  //deb系的系统(如debian、ubuntu)env的路径为/usr/bin/env做软链接兼容处理
+$ cp ./pool_server /usr/local/bin/pool_server
 ```
 
 * 日常运维使用

pool.ini.example config.ini.examplepool.ini.example renamed to config.ini.example

@@ -1,14 +1,14 @@
 [common]
 ;log文件
-log_file = /tmp/phpcp.log
+log_file = /var/log/php-connection-pool/server.log
 ;the num of TCP connections release every idel_time cycles(连接空闲后的回收力度，值越大回收的越快，但是会造成更多的消耗)
 recycle_num = 2
 ;In this period of time,if no process use this connection ,the TCP connection will release(空闲连接回收的发呆时间 单位秒)
-idel_time = 2
+idel_time = 5
 ;worker 进程ping数据库的间隔时间s
-ping_time = 30
-;;max query package len,exceed will throw exception(最大转发的数据包 字节,超过抛异常)
-max_read_len = 1048576
+ping_time = 15
+;;max query package len,exceed will throw exception(最大转发的数据包,超过5M抛异常)
+max_read_len = 16777216
 ;run as daemonize(是否开启守护进程化)
 daemonize = 1
 ;If the num of connection to max, whether to use the queue buffer, set to 0 throw an exception(连接都被占用后,再获取连接是否使用队列缓冲,设置为0直接抛异常)
@@ -21,20 +21,16 @@ port = 6253
 ;max_hold_time_to_log = 1000
 ;for the big data monitor,unit byte ,default 0 means not open(单次查询超过这么大字节写log日志 单位字节 默认为0为不开启log)
 ;tips你可以将这个设置非常小，那么你就可以在log里面看到所有的数据库操作
-;max_data_size_to_log = 1024
-
+;max_data_size_to_log = 40960
+;max_data_size_to_log = 1
 
 ;注意数据源需要加 ''
 ;PDO数据源要与new PDO的第一个参数完全一致（包括顺序）
 ;如果不配置数据源 那么默认最大是20 最小是1 ，在第一次查询的时候自动创建
-['mysql:host=192.168.1.19;dbname=mz_gay_group2;charset=utf8'];mysql配置
-pool_min = 2
-pool_max = 30
-
-['mysql:host=192.168.1.19;dbname=mz_gay_group;charset=utf8'];mysql配置
-pool_min = 2
-pool_max = 30
+;['mysql:dbname=db_name;host=db_host;port=3306;charset=utf8']
+;pool_min = 4 ;必须大于0
+;pool_max = 10
 
-['192.168.1.19:6379:0'];redis配置 ip:port:db号
-pool_min = 2
-pool_max = 30
+;['192.168.1.19:6379:0'];redis配置 ip:port:db号
+;pool_min = 2 ;必须大于0
+;pool_max = 10

connect_pool_client.c

@@ -19,6 +19,7 @@
 #include "php_network.h"
 #include "ext/standard/basic_functions.h"
 
+
 extern zend_class_entry *pdo_connect_pool_class_entry_ptr;
 extern zend_class_entry *redis_connect_pool_class_entry_ptr;
 extern zend_class_entry *memcached_connect_pool_class_entry_ptr;