diff --git a/.travis.yml b/.travis.yml index 8bcf6bc87e..5dd67fd665 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: cpp os: linux -compiler: +compiler: - gcc cache: @@ -18,7 +18,7 @@ addons: - clang-format-3.9 before_install: - - wget https://media.githubusercontent.com/media/XiaoMi/pegasus-common/master/build-depends.tar.gz + - wget https://github.com/XiaoMi/pegasus-common/releases/download/deps/build-depends.tar.gz - tar xfz build-depends.tar.gz - rm -f build-depends.tar.gz - cd packages @@ -27,8 +27,8 @@ before_install: before_script: - cd thirdparty - - wget https://media.githubusercontent.com/media/XiaoMi/pegasus-common/master/pegasus-thirdparty-prebuild.tar.gz - - tar xfz pegasus-thirdparty-prebuild.tar.gz + - wget https://github.com/XiaoMi/pegasus-common/releases/download/deps/pegasus-thirdparty-prebuild.tar.gz + - tar xf pegasus-thirdparty-prebuild.tar.gz - rm -f pegasus-thirdparty-prebuild.tar.gz - cd .. - ulimit -c unlimited -S diff --git a/scripts/linux/start_zk.sh b/scripts/linux/start_zk.sh index fcc5b89eb4..db015fa75a 100755 --- a/scripts/linux/start_zk.sh +++ b/scripts/linux/start_zk.sh @@ -30,7 +30,7 @@ if [ ! -f zookeeper-3.4.6.tar.gz ]; then download_url="http://git.n.xiaomi.com/pegasus/packages/raw/master/zookeeper-3.4.6.tar.gz" wget -T 5 -t 1 $download_url if [ $? -ne 0 ]; then - download_url="https://github.com/xiaomi/pegasus-common/raw/master/zookeeper-3.4.6.tar.gz" + download_url="https://github.com/XiaoMi/pegasus-common/releases/download/deps/zookeeper-3.4.6.tar.gz" wget -T 5 -t 1 $download_url if [ $? -ne 0 ]; then echo "ERROR: download zookeeper failed" @@ -41,7 +41,7 @@ fi if [ ! -d zookeeper-3.4.6 ]; then echo "Decompressing zookeeper..." - tar xfz zookeeper-3.4.6.tar.gz + tar xf zookeeper-3.4.6.tar.gz if [ $? -ne 0 ]; then echo "ERROR: decompress zookeeper failed" exit 1 diff --git a/src/core/tools/common/asio_net_provider.cpp b/src/core/tools/common/asio_net_provider.cpp index af47acf57e..e76d10c35e 100644 --- a/src/core/tools/common/asio_net_provider.cpp +++ b/src/core/tools/common/asio_net_provider.cpp @@ -336,15 +336,15 @@ error_code asio_udp_provider::start(rpc_channel channel, int port, bool client_o _socket.reset(new ::boost::asio::ip::udp::socket(_io_service)); _socket->open(endpoint.protocol(), ec); if (ec) { - dwarn("asio udp socket open failed, error = %s", ec.message().c_str()); + derror("asio udp socket open failed, error = %s", ec.message().c_str()); _socket.reset(); continue; } _socket->bind(endpoint, ec); if (ec) { - dwarn("asio udp socket bind failed, port = %u, error = %s", - _address.port(), - ec.message().c_str()); + derror("asio udp socket bind failed, port = %u, error = %s", + _address.port(), + ec.message().c_str()); _socket.reset(); continue; } @@ -358,15 +358,15 @@ error_code asio_udp_provider::start(rpc_channel channel, int port, bool client_o _socket.reset(new ::boost::asio::ip::udp::socket(_io_service)); _socket->open(endpoint.protocol(), ec); if (ec) { - dwarn("asio udp socket open failed, error = %s", ec.message().c_str()); + derror("asio udp socket open failed, error = %s", ec.message().c_str()); _socket.reset(); return ERR_NETWORK_INIT_FAILED; } _socket->bind(endpoint, ec); if (ec) { - dwarn("asio udp socket bind failed, port = %u, error = %s", - _address.port(), - ec.message().c_str()); + derror("asio udp socket bind failed, port = %u, error = %s", + _address.port(), + ec.message().c_str()); _socket.reset(); return ERR_NETWORK_INIT_FAILED; }