mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-31 23:11:28 +01:00
Code Issues Projects Releases Wiki Activity

Build CI with prometheus support (#999)

Browse Source 
Install dependencies and build with prometheus support during CI builds

Ubuntu 16.04 has issues supporting `MHD_USE_EPOLL_INTERNAL_THREAD` so
disabling it (using SELECT)
Should not impact anything as the only reason we use Ubuntu 16.04 is to
validate build against openssl-1.0.2

Fixes  #998
This commit is contained in:
Pavel Punsky 2022-09-29 14:03:03 -07:00 committed by GitHub
parent 73c14d6b10
commit 05c0b6e34c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/cmake.yaml vendored
View File

@ -19,6 +19,7 @@ jobs:
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y \ sudo apt-get install -y \
wget \
libevent-dev \ libevent-dev \
libssl-dev \ libssl-dev \
libpq-dev libmariadb-dev libsqlite3-dev \ libpq-dev libmariadb-dev libsqlite3-dev \
@ -26,6 +27,12 @@ jobs:
libmongoc-dev \ libmongoc-dev \
libmicrohttpd-dev libmicrohttpd-dev
- uses: actions/checkout@v3 - 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 - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build - name: Build

5
.github/workflows/tests.yml vendored
View File

@ -24,6 +24,7 @@ jobs:
apt-get install -y \ apt-get install -y \
build-essential pkgconf build-essential pkgconf
apt-get install -y \ apt-get install -y \
wget \
libevent-dev \ libevent-dev \
libssl-dev \ libssl-dev \
libpq-dev libsqlite3-dev \ libpq-dev libsqlite3-dev \
@ -32,6 +33,10 @@ jobs:
libmicrohttpd-dev 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-client-lgpl-dev; fi
if [ ${{ matrix.os }} != 'ubuntu:16.04' ]; then apt-get install -y libmariadb-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 - uses: actions/checkout@v3
- name: configure - name: configure
run: ./configure run: ./configure

10
src/apps/relay/prom_server.c
View File

@ -70,9 +70,17 @@ int start_prometheus_server(void){
promhttp_set_active_collector_registry(NULL); 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_is_feature_supported(MHD_FEATURE_EPOLL)) {
#if MHD_USE_EPOLL_INTERNAL_THREAD
flags |= MHD_USE_EPOLL_INTERNAL_THREAD; flags |= MHD_USE_EPOLL_INTERNAL_THREAD;
#else
flags |= MHD_USE_SELECT_INTERNALLY; //ubuntu 16.04
#endif
} else { } else {
flags |= MHD_USE_SELECT_INTERNALLY; flags |= MHD_USE_SELECT_INTERNALLY;
} }