diff --git a/packageship/packageship/package.ini b/packageship/packageship/package.ini index 46444d84ca9ccef4c0ebfebd48087495c908a1c2..f21decee56deb0a3f37cff6a55f9b12941e2cda0 100644 --- a/packageship/packageship/package.ini +++ b/packageship/packageship/package.ini @@ -62,8 +62,12 @@ log_level=INFO log_name=log_info.log [UWSGI] - +; uwsgi log file path daemonize=/var/log/uwsgi.log - +; The data size transferred from back to forth buffer-size=65536 +; HTTP Connection time +http-timeout=600 +; Server response time +harakiri=600 diff --git a/packageship/packageship/pkgshipd b/packageship/packageship/pkgshipd index 1425581fd6c7a39ee4aacf25b78c62a75fd9e5ab..a6d2847e7ac5be7d0d0b9970df12f08fc06b9533 100755 --- a/packageship/packageship/pkgshipd +++ b/packageship/packageship/pkgshipd @@ -18,13 +18,16 @@ function create_config_file(){ echo "[INFO] config type is: $service" daemonize=$(get_config "$service" "daemonize") buffer_size=$(get_config "$service" "buffer-size") + http_timeout=$(get_config "$service" "http-timeout") + harakiri=$(get_config "$service" "harakiri") wsgi_file_path=$(find /usr/lib/ -name "packageship") if [ $service = "manage" -o $service = "all" ];then write_port=$(get_config "$service" "write_port") write_ip_addr=$(get_config "$service" "write_ip_addr") - if [[ -z "$daemonize" ]] || [[ -z "$buffer_size" ]] || [[ -z "$write_ip_addr" ]] || [[ -z "$write_port" ]];then + if [[ -z "$daemonize" ]] || [[ -z "$buffer_size" ]] || [[ -z "$write_ip_addr" ]] || [[ -z "$http_timeout" ]] || [[ -z "$harakiri" ]] || [[ -z "$write_port" ]]; + then echo "[ERROR] CAN NOT find all config name in: $SYS_PATH/package.ini, Please check the file" - echo "[ERROR] The following config name is needed: daemonize, buffer_size, write_port and write_ip_addr" + echo "[ERROR] The following config name is needed: daemonize, buffer-size, write_port, write_ip_addr, harakiri and http-timeout" exit 1 fi if [ -z "$wsgi_file_path" ];then @@ -39,6 +42,8 @@ wsgi-file=$wsgi_file_path/manage.py callable=app buffer-size=$buffer_size pidfile=$OUT_PATH/manage.pid +http-timeout=$http_timeout +harakiri=$harakiri daemonize=$daemonize" > $OUT_PATH/manage.ini fi @@ -46,9 +51,9 @@ daemonize=$daemonize" > $OUT_PATH/manage.ini query_port=$(get_config "$service" "query_port") query_ip_addr=$(get_config "$service" "query_ip_addr") - if [[ -z "$daemonize" ]] || [[ -z "$buffer_size" ]] || [[ -z "$query_ip_addr" ]] || [[ -z "$query_port" ]];then + if [[ -z "$daemonize" ]] || [[ -z "$buffer_size" ]] || [[ -z "$query_ip_addr" ]] || [[ -z "$http_timeout" ]] || [[ -z "$harakiri" ]] || [[ -z "$query_port" ]];then echo "[ERROR] CAN NOT find all config name in: $SYS_PATH/package.ini, Please check the file." - echo "[ERROR] The following config name is needed: daemonize, buffer_size, query_port and query_ip_addr." + echo "[ERROR] The following config name is needed: daemonize, buffer_size, query_port, query_ip_addr, harakiri and http-timeout." exit 1 fi if [ -z "$wsgi_file_path" ];then @@ -64,6 +69,8 @@ wsgi-file=$wsgi_file_path/selfpkg.py callable=app buffer-size=$buffer_size pidfile=$OUT_PATH/selfpkg.pid +http-timeout=$http_timeout +harakiri=$harakiri daemonize=$daemonize" > $OUT_PATH/selfpkg.ini fi