Commit 76fa394b authored by jan.koester's avatar jan.koester
Browse files

files no timeout

parent 6b6bee5e

packaging/build-nspawn.sh

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ CLANG_RESOURCE=\"\$(clang-${LLVM_VERSION} -print-resource-dir)\" 


unset CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH OBJCPLUS_INCLUDE_PATH INCLUDE



COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -nostdinc++ -nostdlibinc -nobuiltininc -isystem /usr/local/musl/include/c++/v1 -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"

COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -nostdinc++ -nostdlibinc -isystem /usr/local/musl/include/c++/v1 -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"



if [ \"\\\$LINKING\" = \"1\" ]; then

    exec clang++-${LLVM_VERSION} \\\$COMPILE_FLAGS \\\\
@@ -326,7 +326,7 @@ CLANG_RESOURCE=\"\$(clang-${LLVM_VERSION} -print-resource-dir)\" 


unset CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH OBJCPLUS_INCLUDE_PATH INCLUDE



COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -nostdlibinc -nobuiltininc -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"

COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -nostdlibinc -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"



if [ \"\\\$LINKING\" = \"1\" ]; then

    exec clang-${LLVM_VERSION} \\\$COMPILE_FLAGS \\\\

plugins/nginxfiler/filer.cpp

+8 −4
Original line number Diff line number Diff line
@@ -265,7 +265,11 @@ namespace blogi { 


                libhttppp::HttpRequest nreq;



                libhttppp::HttpClient client(url);

                // Without an explicit timeout an unreachable/stalled filer

                // backend would block this worker indefinitely.

                int timeout = _Timeout > 0 ? _Timeout : 60;

                libhttppp::HttpClient client(url, 2, timeout);

                client.setTimeout(timeout);



                std::vector<char> json = client.Get(nreq);
@@ -332,10 +336,10 @@ namespace blogi { 
    private:



        std::string _NHost;

        int         _NPort;

        int         _NPort = 80;

        std::string _NPrefix;

        bool        _NSSL;

        int         _Timeout;

        bool        _NSSL = false;

        int         _Timeout = 60;

    };

};