From cb5227be7fcefeb423659bbe682fed59f446383e Mon Sep 17 00:00:00 2001 From: Rucknium Date: Mon, 15 Apr 2024 23:14:12 +0000 Subject: [PATCH] Fixed bug reported by @SyntheticBird45 . systemd-started monerod names.. the log file monero.log instead of bitmonero.log --- R/ping.R | 16 +++++++++++++--- man/ping.peers.Rd | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/R/ping.R b/R/ping.R index cf255a1..0a37610 100644 --- a/R/ping.R +++ b/R/ping.R @@ -16,15 +16,25 @@ #' \dontrun{ #' ping.peers() #' } -ping.peers <- function(bitmonero.dir = "~/.bitmonero", output.file = "/monero_peer_pings.csv", sleep = 10, ping.count = 5, threads = NULL) { +ping.peers <- function(bitmonero.dir = "~/.bitmonero", output.file = "monero_peer_pings.csv", sleep = 10, ping.count = 5, threads = NULL) { bitmonero.dir <- path.expand(bitmonero.dir) bitmonero.dir <- gsub("/+$", "", bitmonero.dir) # Remove trailing slash(es) if they exist - output.file <- paste0(bitmonero.dir, output.file) + output.file <- paste0(bitmonero.dir, "/", output.file) - log.file <- paste0(bitmonero.dir, "/bitmonero.log") + files.in.dir <- list.files(bitmonero.dir) + log.file.name <- files.in.dir[grepl("(^bitmonero[.]log$)|(^monero[.]log$)", files.in.dir, ignore.case = TRUE)] + if (length(log.file.name) == 0) { + stop("Cannot find log file in bitmonero.dir") + } + + if (length(log.file.name) > 1) { + stop("Files named 'bitmonero.log' _and_ 'monero.log' exist in bitmonero.dir") + } + + log.file <- paste0(bitmonero.dir, "/", log.file.name) first.file.line <- readr::read_lines(log.file, n_max = 1) # Get the first file line so we know when the log file rolls over diff --git a/man/ping.peers.Rd b/man/ping.peers.Rd index 51e6618..534054f 100644 --- a/man/ping.peers.Rd +++ b/man/ping.peers.Rd @@ -6,7 +6,7 @@ \usage{ ping.peers( bitmonero.dir = "~/.bitmonero", - output.file = "/monero_peer_pings.csv", + output.file = "monero_peer_pings.csv", sleep = 10, ping.count = 5, threads = NULL