Skip to content

Commit 096a84f

Browse files
author
Stefan Fleck
committed
merge
Merge branch 'master' of https://github.com/s-fleck/lgr # Conflicts: # DESCRIPTION # NEWS.md # docs/articles/lgr.html # docs/index.html # docs/pkgdown.yml # docs/reference/AppenderConsole.html # docs/reference/AppenderDt.html # docs/reference/AppenderFile.html # docs/reference/AppenderJson.html # docs/reference/AppenderSyslog.html # docs/reference/EventFilter.html # docs/reference/LayoutFormat.html # docs/reference/LayoutGlue.html # docs/reference/LayoutJson.html # docs/reference/LogEvent.html # docs/reference/Logger.html # docs/reference/as.data.frame.LogEvent.html # docs/reference/basic_config.html # docs/reference/default_exception_handler.html # docs/reference/get_logger.html # docs/reference/print.LogEvent.html # docs/reference/simple_logging.html # docs/reference/suspend_logging.html # docs/reference/with_log_level.html
2 parents 867f511 + 9ea0d81 commit 096a84f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+829
-947
lines changed

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# dev version
22

3-
* Improved performance of looking up the parent of a Logger.
3+
* Improved performance of looking up the parent of a Logger, and therefore also
4+
of resolving inheritance of appenders or threshdolds.
45

56

67
# lgr 0.3.2

R/basic_config.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#'
33
#' A quick and easy way to configure the root logger. This is less powerful
44
#' then using [`lgr$config()` or `lgr$set_*()`][Logger], but reduces the
5-
#' most common configrations to a single line of code.
5+
#' most common configurations to a single line of code.
66
#'
77
#' @param file `character` scalar: If not `NULL` a [AppenderFile] will be
88
#' created that logs to this file. If the filename ends in `.jsonl`, the

cran-comments.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Test environments
2-
* ubuntu 18.04, R 3.6.0
2+
* ubuntu 18.04, R 3.6.1
33
* ubuntu 14.04 (on travis-ci), R 3.5.2
4-
* ubuntu 14.04 (remote RStudio server), R 3.4.3
4+
* ubuntu 14.04 (remote RStudio server), R 3.6.1
55
* win-builder (devel and release)
66
* rhub (rhub::check_for_cran())
77

@@ -10,5 +10,8 @@
1010

1111
0 errors | 0 warnings | 0 notes
1212

13-
updates test suite for compatibility with the upcomming version of the package
14-
**rotor** (and also includes a few small fixes and improvements)
13+
Adds appender that can write to syslog. This introduces an optional dependency
14+
on the linux-only rsyslog package, so checks fail on windows if suggests are
15+
forced. Running the tests/examples of this package will write a few lines to
16+
the syslog on linux systems, if this is an undesired side effect I can disable
17+
the tests.

docs/404.html

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE-text.html

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE.html

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/index.html

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)