Skip to content

Commit 66fdb14

Browse files
committed
use CLUSTERMQ_AUTO_LIBZMQ to always enable crash monitor
1 parent 4df92ba commit 66fdb14

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Random seed initialization now starts from the supplied seed
44
* Worker errors now report the random seed if used
55
* Worker memory is now reported for the process instead of R only
6+
* Installation: `CLUSTERMQ_AUTO_LIBZMQ=1` will ensure crash monitor is enabled
67

78
# clustermq 0.10.0
89

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cluster with a minimal interface provided by the `Q` function:
1111

1212
```r
1313
# install/load the package if you haven't done so yet
14+
Sys.setenv(CLUSTERMQ_AUTO_LIBZMQ=1)
1415
install.packages('clustermq')
1516
library(clustermq)
1617

configure

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ if [ -z "$CLUSTERMQ_USE_SYSTEM_LIBZMQ" ]; then
1414
echo "* libzmq has DRAFT API -> enabling crash monitor feature"
1515
CLUSTERMQ_USE_SYSTEM_LIBZMQ=1
1616
else
17-
echo "* libzmq without DRAFT API found -> disabling crash monitor feature"
18-
CLUSTERMQ_USE_SYSTEM_LIBZMQ=1
17+
if [ -z "$CLUSTERMQ_AUTO_LIBZMQ" ]; then
18+
echo "* libzmq without DRAFT API found -> disabling crash monitor feature"
19+
CLUSTERMQ_USE_SYSTEM_LIBZMQ=1
20+
else
21+
echo "* libzmq without DRAFT API found -> using bundled library instead"
22+
CLUSTERMQ_USE_SYSTEM_LIBZMQ=0
23+
fi
1924
fi
2025
else
2126
echo "* no system libzmq>=4.3.0 found -> using bundled libzmq"

vignettes/userguide.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ the bundled library:
4040
# If your system has `libzmq` installed but you want to enable the worker
4141
# crash monitor, set the environment variable below to use the bundled
4242
# `libzmq` library with the required feature (`-DZMQ_BUILD_DRAFT_API=1`):
43-
Sys.setenv(CLUSTERMQ_USE_SYSTEM_LIBZMQ=0)
43+
Sys.setenv(CLUSTERMQ_AUTO_LIBZMQ=1)
4444
install.packages("clustermq")
4545
```
4646

@@ -51,7 +51,7 @@ compilation:
5151
```{r eval=FALSE}
5252
if (!requireNamespace("remotes", quietly=TRUE))
5353
install.packages("remotes")
54-
Sys.setenv(CLUSTERMQ_USE_SYSTEM_LIBZMQ=0)
54+
Sys.setenv(CLUSTERMQ_AUTO_LIBZMQ=1)
5555
remotes::install_github("mschubert/clustermq")
5656
# remotes::install_github("mschubert/clustermq@develop") # dev version
5757
```

0 commit comments

Comments
 (0)