Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
    npro  
 Modern all-safe Rust Network Protocol library supporting h1, h2, h3, ws, wt sans-IO and with socket IO + tls
git clone https://npro.rs/repo/npro
 
root / assets / linux-gentoo.svg
Author[]Andy Green <andy@warmcat.com> 2025-04-24 10:08 UTC
Committer[]Andy Green <andy@warmcat.com> 2025-04-24 10:28 UTC
Tree26585e2b72475ac7a172bbce41d80c30c8974175   Raw Patch
 
metrics: make optional
metrics: make optional
diff --git a/CMakeLists.txt b/CMakeLists.txt index 12e50e5..1de9f1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,7 @@ set(requirements 1) require_lws_config(LWS_ROLE_H1 1 requirements) require_lws_config(LWS_ROLE_WS 1 requirements) require_lws_config(LWS_WITH_JOSE 1 requirements) -require_lws_config(LWS_WITH_PLUGINS_BUILTIN 1 requirements) +#require_lws_config(LWS_WITH_PLUGINS_BUILTIN 1 requirements) if (requirements) diff --git a/README.md b/README.md index 08b2161..09041dd 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,8 @@ eg for windows or emulated architecture VMs. Builds happen using a user `sai` and on the builder, files are only created down `/home/sai` or `\Users\sai`. +Note: on redhat type distros like Fedora / Rocky, use `-gnobody` + ``` # useradd -u883 -gnogroup sai -d/home/sai -m -r ``` @@ -271,7 +273,7 @@ Building sai produces two different sets of apps and daemons by default, for running on a the server that coordinates the builds and for running on machines that offer the actual builds for particular platforms to one or more servers. -You can use cmake options `-DSAI_MASTER=0` and `-DSAI_BUILDER=0` to disable one +You can use cmake options `-DSAI_SERVER=0` and `-DSAI_BUILDER=0` to disable one or the other. Server executables|Function @@ -309,6 +311,9 @@ either|`-DLWS_WITH_STRUCT_JSON=1` `-DLWS_WITH_SECURE_STREAMS=1` server|`-DLWS_UNIX_SOCK=1` `-DLWS_WITH_GENCRYPTO=1` `-DLWS_WITH_STRUCT_SQLITE3=1` `-DLWS_WITH_JOSE=1` builder + related|`-DLWS_WITH_SPAWN=1` `-DLWS_WITH_THREADPOOL=1` +You can also define `-DLWS_WITH_SYS_METRICS=1` on lws to enable build of +openmetrics pieces in sai when built against lws. + Similarly the two daemons bring in different dependencies Feature|dependency @@ -322,7 +327,7 @@ jig (linux only)|libgpiod ``` $ git clone https://warmcat.com/repo/sai -$ cd sai && mkdir build && cd build && cmake .. && make && make install +$ cd sai && mkdir build && cd build && cmake .. && make && sudo make install $ sudo cp ../scripts/sai-builder.service /etc/systemd/system $ sudo mkdir -p /etc/sai/builder $ sudo cp ../scripts/builder-conf /etc/sai/builder/conf diff --git a/src/builder/b-sai.c b/src/builder/b-sai.c index f65c639..2dc3c0c 100644 --- a/src/builder/b-sai.c +++ b/src/builder/b-sai.c @@ -122,7 +122,11 @@ static const struct lws_protocols *pprotocols[] = { &protocol_stdxxx, &protocol_logproxy, &protocol_resproxy, +#if defined(LWS_WITH_SYS_METRICS) && defined(LWS_WITH_PLUGINS_BUILTIN) &lws_openmetrics_export_protocols[LWSOMPROIDX_PROX_WS_CLIENT], +#else + NULL, +#endif NULL }; diff --git a/src/server/s-sai.c b/src/server/s-sai.c index a3d90c1..c119d5e 100644 --- a/src/server/s-sai.c +++ b/src/server/s-sai.c @@ -55,8 +55,12 @@ static const char * const default_ss_policy = static const struct lws_protocols *pprotocols[] = { &protocol_ws, +#if defined(LWS_WITH_SYS_METRICS) && defined(LWS_WITH_PLUGINS_BUILTIN) &lws_openmetrics_export_protocols[LWSOMPROIDX_PROX_HTTP_SERVER], &lws_openmetrics_export_protocols[LWSOMPROIDX_PROX_WS_SERVER], +#else + NULL, NULL, +#endif NULL };
Page fetched 0s ago, creation time: 3ms (vhost etag hits: 0%, cache hits: 0%)