diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index ee336206..f56aaaea 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -19,6 +19,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y \ + wget \ libevent-dev \ libssl-dev \ libpq-dev libmariadb-dev libsqlite3-dev \ @@ -26,6 +27,12 @@ jobs: libmongoc-dev \ libmicrohttpd-dev - uses: actions/checkout@v3 + - name: Prometheus support + run: | + wget https://github.com/digitalocean/prometheus-client-c/releases/download/v0.1.3/libprom-dev-0.1.3-Linux.deb && \ + wget https://github.com/digitalocean/prometheus-client-c/releases/download/v0.1.3/libpromhttp-dev-0.1.3-Linux.deb && \ + sudo apt install ./libprom-dev-0.1.3-Linux.deb ./libpromhttp-dev-0.1.3-Linux.deb && \ + rm ./libprom-dev-0.1.3-Linux.deb ./libpromhttp-dev-0.1.3-Linux.deb - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index abbf5eac..0b676d09 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,6 +24,7 @@ jobs: apt-get install -y \ build-essential pkgconf apt-get install -y \ + wget \ libevent-dev \ libssl-dev \ libpq-dev libsqlite3-dev \ @@ -32,6 +33,10 @@ jobs: libmicrohttpd-dev if [ ${{ matrix.os }} = 'ubuntu:16.04' ]; then apt-get install -y libmariadb-client-lgpl-dev; fi if [ ${{ matrix.os }} != 'ubuntu:16.04' ]; then apt-get install -y libmariadb-dev; fi + wget https://github.com/digitalocean/prometheus-client-c/releases/download/v0.1.3/libprom-dev-0.1.3-Linux.deb && \ + wget https://github.com/digitalocean/prometheus-client-c/releases/download/v0.1.3/libpromhttp-dev-0.1.3-Linux.deb && \ + apt install ./libprom-dev-0.1.3-Linux.deb ./libpromhttp-dev-0.1.3-Linux.deb && \ + rm ./libprom-dev-0.1.3-Linux.deb ./libpromhttp-dev-0.1.3-Linux.deb - uses: actions/checkout@v3 - name: configure run: ./configure diff --git a/src/apps/relay/prom_server.c b/src/apps/relay/prom_server.c index 586e381d..7de1f95c 100644 --- a/src/apps/relay/prom_server.c +++ b/src/apps/relay/prom_server.c @@ -70,9 +70,17 @@ int start_prometheus_server(void){ promhttp_set_active_collector_registry(NULL); - unsigned int flags = MHD_USE_DUAL_STACK | MHD_USE_ERROR_LOG; + unsigned int flags = MHD_USE_DUAL_STACK +#if MHD_USE_ERROR_LOG + | MHD_USE_ERROR_LOG +#endif + ; if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) { + #if MHD_USE_EPOLL_INTERNAL_THREAD flags |= MHD_USE_EPOLL_INTERNAL_THREAD; + #else + flags |= MHD_USE_SELECT_INTERNALLY; //ubuntu 16.04 + #endif } else { flags |= MHD_USE_SELECT_INTERNALLY; }