mirror of
https://github.com/vgough/encfs.git
synced 2024-11-21 15:33:16 +01:00
Update easylogging vendor (#596)
This commit is contained in:
Ben RUBSON
GitHub
parent
4a95d700e6
commit
a64397135c
2
vendor/github.com/muflihun/easyloggingpp/.gitignore
generated
vendored
2
vendor/github.com/muflihun/easyloggingpp/.gitignore
generated
vendored
@ -6,4 +6,4 @@ release.info
|
||||
bin/*
|
||||
logs/*
|
||||
experiments/*
|
||||
CMakeLists.txt.user
|
||||
CMakeLists.txt.user*
|
||||
|
||||
71
vendor/github.com/muflihun/easyloggingpp/.travis.yml
generated
vendored
71
vendor/github.com/muflihun/easyloggingpp/.travis.yml
generated
vendored
@ -1,11 +1,72 @@
|
||||
language: cpp
|
||||
compiler:
|
||||
- gcc
|
||||
os: linux
|
||||
dist: trusty
|
||||
matrix:
|
||||
include:
|
||||
# - os: linux
|
||||
# dist: trusty
|
||||
# compiler: clang
|
||||
# before_install:
|
||||
# - sudo add-apt-repository ppa:kubuntu-ppa/backports -y
|
||||
# - sudo apt-get -qq update
|
||||
# - sudo apt-get install -y libgtest-dev valgrind cmake
|
||||
# - sudo apt-get install --only-upgrade cmake
|
||||
# - sudo wget https://github.com/google/googletest/archive/release-1.7.0.tar.gz
|
||||
# - sudo tar xf release-1.7.0.tar.gz
|
||||
# - cd googletest-release-1.7.0
|
||||
# - sudo cmake -DBUILD_SHARED_LIBS=ON .
|
||||
# - sudo make
|
||||
# - sudo cp -a include/gtest /usr/include
|
||||
# - sudo cp -a libgtest_main.so libgtest.so /usr/lib/
|
||||
# - g++ -v
|
||||
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-4.8
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: [g++-4.8, valgrind]
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-4.9
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: [g++-4.9, valgrind]
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-5
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: [g++-5, valgrind]
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-6
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: [g++-6, valgrind]
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: gcc
|
||||
env:
|
||||
- COMPILER=g++-7
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: [g++-7, valgrind]
|
||||
|
||||
before_install:
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get install -y libgtest-dev valgrind
|
||||
- sudo apt-get install -y libgtest-dev valgrind cmake
|
||||
- sudo wget https://github.com/google/googletest/archive/release-1.7.0.tar.gz
|
||||
- sudo tar xf release-1.7.0.tar.gz
|
||||
- cd googletest-release-1.7.0
|
||||
|
||||
15
vendor/github.com/muflihun/easyloggingpp/ACKNOWLEDGEMENTS.md
generated
vendored
Normal file
15
vendor/github.com/muflihun/easyloggingpp/ACKNOWLEDGEMENTS.md
generated
vendored
Normal file
@ -0,0 +1,15 @@
|
||||
# Acknowledgements
|
||||
This file contains list of contributors and acknowledgement of their efforts in making this library better especially by making acceptable code changes.
|
||||
|
||||
If we have missed your name please feel free to add it with contribution link.
|
||||
|
||||
| **Github User** | **Contribution** |
|
||||
|--------------------------------------|----------------------------------|
|
||||
| [@aparajita](https://github.com/aparajita) | [Separated out .h and .cc file](https://github.com/muflihun/easyloggingpp/pulls?q=is%3Apr+author%3Aaparajita) |
|
||||
| [@adah1972](https://github.com/adah1972) | [A lot of contributions](https://github.com/muflihun/easyloggingpp/pulls?q=is%3Apr+author%3Aadah1972) |
|
||||
| [@miguelmartin75](https://github.com/miguelmartin75) | [Issue #11](https://github.com/muflihun/easyloggingpp/issues/11), [PR #16](https://github.com/muflihun/easyloggingpp/pull/16) |
|
||||
| [@moneromooo-monero](https://github.com/moneromooo-monero) | [A lot of contributions](https://github.com/muflihun/easyloggingpp/pulls?q=is%3Apr+author%3Amoneromooo-monero)|
|
||||
| [@MonsieurNicolas](https://github.com/MonsieurNicolas) | [PR #593](https://github.com/muflihun/easyloggingpp/pull/593) |
|
||||
| [@acowley](https://github.com/acowley) | [PR #593](https://github.com/muflihun/easyloggingpp/pull/577) |
|
||||
| [@rggjan](https://github.com/rggjan) | [PR 561](https://github.com/muflihun/easyloggingpp/pull/561) |
|
||||
| [@sgtcodfish](https://github.com/sgtcodfish) | Support for emscripten |
|
||||
69
vendor/github.com/muflihun/easyloggingpp/CHANGELOG.md
generated
vendored
69
vendor/github.com/muflihun/easyloggingpp/CHANGELOG.md
generated
vendored
@ -1,5 +1,74 @@
|
||||
# Change Log
|
||||
|
||||
## [9.96.7] - 24-11-2018
|
||||
- Adds support for compiling easyloggingpp using Emscripten. This allows the library to be compiled into Javascript or WebAssembly and run in the browser while logging to the browser's Javascript console.
|
||||
|
||||
## [9.96.6] - 24-11-2018
|
||||
- Storage constructor (indirectly) attempts to access elStorage before it's initialized (issue #660) (@Barteks2x)
|
||||
- Fixed unused variable warning while build without performance logging feature (@wrgcpp)
|
||||
- Updated license
|
||||
|
||||
## [9.96.5] - 07-09-2018
|
||||
### Fixes
|
||||
- Check for level enabled when using custom log message (Advanced) (issue #666)
|
||||
- Ignore interruption signal crash log
|
||||
|
||||
## [9.96.4] - 03-04-2018
|
||||
### Fixes
|
||||
- Fixes seg fault with global lock (issue #580)
|
||||
|
||||
## [9.96.3] - 01-04-2018
|
||||
### Fixes
|
||||
- Demangling in GCC fixed
|
||||
- `ELPP_NO_DEFAULT_LOG_FILE` now logs to null device on major platforms (windows and unix)
|
||||
- Fixes unused warnings for constants
|
||||
|
||||
## [9.96.2] - 27-02-2018
|
||||
### Updates
|
||||
- Dispatcher now passes in pointer to log message instead of creating on the fly
|
||||
- Introduced new constructor for `Writer` for advanced usage (see muflihun/residue)
|
||||
- Use `std::unordered_map` for memory management instead of `std::map` issue #611
|
||||
|
||||
## [9.96.1] - 23-02-2018
|
||||
### Fixes
|
||||
- Two loggers writing to same file is undefined behaviour #613
|
||||
|
||||
## [9.96.0] - 14-02-2018
|
||||
### Fixes
|
||||
- Potential deadlocks in extreme edge case #609
|
||||
- Respect `MaxLogFileSize` setting even when `ELPP_NO_DEFAULT_LOG_FILE` is set (@MonsieurNicolas)
|
||||
- Disable log file **initially** when using `ELPP_NO_LOG_TO_FILE`, to be consistent with documentation (@rggjan)
|
||||
|
||||
### Updates
|
||||
- `el::Storage` no longer contains locks as it should be
|
||||
- Reformatted both files with `astyle`
|
||||
- License text updated
|
||||
|
||||
### Added
|
||||
- Install a pkg-config `.pc` file (@acowley)
|
||||
|
||||
## [9.95.4] - 10-02-2018
|
||||
### Fixes
|
||||
- Fix documentation (see PR#597)
|
||||
- Fix buffer underflow in getBashOutput (see PR#596)
|
||||
|
||||
### Updates
|
||||
- Added new function `Helpers::reserveCustomFormatSpecifier` (see #606)
|
||||
- Made `DateTime::buildTimeInfo` public for use
|
||||
|
||||
## [9.95.3] - 13-10-2017
|
||||
### Fixes
|
||||
- Multithreading issue fixed raised from last release at log builder
|
||||
|
||||
## [9.95.2] - 12-06-2017
|
||||
### Fixes
|
||||
- Build fix for kFreeBSD as suggested in issue #563
|
||||
- Fixed issue with deadlock on dispatch (see #571)
|
||||
- Fixed printf like logging with thread safety (see #572)
|
||||
|
||||
### Updates
|
||||
- Added support for AIX (thanks to @apollo13)
|
||||
|
||||
## [9.95.0] - 02-08-2017
|
||||
### Added
|
||||
- Added NetBSD as unix [coypoop](https://github.com/muflihun/easyloggingpp/pull/548/commits)
|
||||
|
||||
17
vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
generated
vendored
17
vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
generated
vendored
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
cmake_minimum_required(VERSION 2.8.7)
|
||||
|
||||
project(Easyloggingpp CXX)
|
||||
|
||||
@ -26,11 +26,12 @@ option(build_static_lib "Build easyloggingpp as a static library" OFF)
|
||||
option(lib_utc_datetime "Build library with UTC date/time logging" OFF)
|
||||
|
||||
set(ELPP_MAJOR_VERSION "9")
|
||||
set(ELPP_MINOR_VERSION "95")
|
||||
set(ELPP_PATCH_VERSION "0")
|
||||
set(ELPP_MINOR_VERSION "96")
|
||||
set(ELPP_PATCH_VERSION "7")
|
||||
set(ELPP_VERSION_STRING "${ELPP_MAJOR_VERSION}.${ELPP_MINOR_VERSION}.${ELPP_PATCH_VERSION}")
|
||||
|
||||
set(ELPP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
|
||||
set(ELPP_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
|
||||
@ -40,6 +41,11 @@ install(FILES
|
||||
DESTINATION "${ELPP_INCLUDE_INSTALL_DIR}"
|
||||
COMPONENT dev)
|
||||
|
||||
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/easyloggingpp.pc.cmakein
|
||||
${CMAKE_CURRENT_BINARY_DIR}/easyloggingpp.pc @ONLY)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/easyloggingpp.pc DESTINATION "${ELPP_PKGCONFIG_INSTALL_DIR}")
|
||||
|
||||
if (build_static_lib)
|
||||
if (lib_utc_datetime)
|
||||
add_definitions(-DELPP_UTC_DATETIME)
|
||||
@ -47,6 +53,7 @@ if (build_static_lib)
|
||||
|
||||
require_cpp11()
|
||||
add_library(easyloggingpp STATIC src/easylogging++.cc)
|
||||
set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
install(TARGETS
|
||||
easyloggingpp
|
||||
@ -68,6 +75,10 @@ if (test)
|
||||
|
||||
enable_testing()
|
||||
|
||||
if (EMSCRIPTEN)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-O2 -s TOTAL_MEMORY=134217728")
|
||||
endif()
|
||||
|
||||
add_executable(easyloggingpp-unit-tests
|
||||
src/easylogging++.cc
|
||||
test/main.cc
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2017 muflihun.com
|
||||
Copyright (c) 2012-2018 Zuhd Web Services
|
||||
Copyright (c) 2012-2018 @abumusamq
|
||||
|
||||
https://github.com/muflihun/
|
||||
https://muflihun.github.io
|
||||
https://github.com/zuhd-org/
|
||||
https://zuhd.org
|
||||
https://muflihun.com
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
232
vendor/github.com/muflihun/easyloggingpp/README.md
generated
vendored
232
vendor/github.com/muflihun/easyloggingpp/README.md
generated
vendored
@ -1,26 +1,24 @@
|
||||
بسم الله الرَّحْمَنِ الرَّحِيمِ
|
||||
|
||||
<p align="center">
|
||||
﷽
|
||||
</p>
|
||||
|
||||
![banner]
|
||||
|
||||
> **Manual For v9.95.0**
|
||||
> **Manual For v9.96.7**
|
||||
|
||||
[](https://travis-ci.org/muflihun/easyloggingpp) (`develop`)
|
||||
[](#build-matrix)
|
||||
[](#build-matrix)
|
||||
[](https://ci.appveyor.com/project/abumusamq/easyloggingpp-node)
|
||||
|
||||
[](https://travis-ci.org/muflihun/easyloggingpp) (`master`)
|
||||
|
||||
[](https://github.com/muflihun/easyloggingpp/releases/latest)
|
||||
|
||||
[](http://www.conan.io/source/easyloggingpp/9.95.0/memsharded/testing)
|
||||
|
||||
[](http://melpon.org/wandbox/permlink/rwDXGcnP1IoCKXrJ)
|
||||
[](https://github.com/muflihun/easyloggingpp/releases/latest)
|
||||
[](https://www.npmjs.com/package/easyloggingpp)
|
||||
|
||||
[](https://github.com/muflihun/easyloggingpp/blob/master/LICENCE)
|
||||
|
||||
[](https://www.paypal.me/MuflihunDotCom/25)
|
||||
|
||||
[](https://github.com/muflihun/easyloggingpp/releases/latest)
|
||||
|
||||
[](https://www.paypal.me/zuhd/25)
|
||||
|
||||
|
||||
### Quick Links
|
||||
|
||||
[![download] Latest Release](https://github.com/muflihun/easyloggingpp/releases/latest)
|
||||
@ -33,7 +31,7 @@
|
||||
|
||||
### Table of Contents
|
||||
<pre>
|
||||
<a href="#introduction">Introduction</a>
|
||||
<a href="#overview">Overview</a>
|
||||
<a href="#why-yet-another-library">Why yet another library</a>
|
||||
<a href="#features-at-a-glance">Features at a glance</a>
|
||||
<a href="#getting-started">Getting Started</a>
|
||||
@ -64,7 +62,7 @@
|
||||
<a href="#network-logging">Network Logging</a>
|
||||
<a href="#verbose-logging">Verbose Logging</a>
|
||||
<a href="#basic-1">Basic</a>
|
||||
<a href="#conditional-and-occasional">Conditional and Occasional</a>
|
||||
<a href="#conditional-and-occasional-logging">Conditional and Occasional</a>
|
||||
<a href="#verbose-level">Verbose Level</a>
|
||||
<a href="#check-if-verbose-logging-is-on">Check If Verbose Logging Is On</a>
|
||||
<a href="#vmodule">VModule</a>
|
||||
@ -101,14 +99,17 @@
|
||||
<a href="#submitting-patches">Submitting Patches</a>
|
||||
<a href="#reporting-a-bug">Reporting a Bug</a>
|
||||
<a href="#compatibility">Compatibility</a>
|
||||
<a href="#build-matrix">Build Matrix</a>
|
||||
<a href="#licence">Licence</a>
|
||||
<a href="#disclaimer">Disclaimer</a>
|
||||
</pre>
|
||||
|
||||
# Introduction
|
||||
Easylogging++ is single header efficient logging library for C++ applications. It is extremely powerful, highly extendable and configurable to user's requirements. It provides ability to [write your own sinks](https://github.com/muflihun/easyloggingpp/tree/master/samples/send-to-network) (referred to as `LogDispatchCallback`). Currently used by hundreds of open-source projects.
|
||||
# Overview
|
||||
Easylogging++ is single header efficient logging library for C++ applications. It is extremely powerful, highly extendable and configurable to user's requirements. It provides ability to [write your own _sinks_](/samples/send-to-network) (via featured referred as `LogDispatchCallback`). This library is currently used by [hundreds of open-source projects on github](https://github.com/search?q=%22easylogging%2B%2B.h%22&type=Code&utf8=%E2%9C%93) and other open-source source control management sites.
|
||||
|
||||
This manual is for Easylogging++ v9.95.0. For other versions please refer to corresponding [release](https://github.com/muflihun/easyloggingpp/releases) on github.
|
||||
This manual is for Easylogging++ v9.96.7. For other versions please refer to corresponding [release](https://github.com/muflihun/easyloggingpp/releases) on github.
|
||||
|
||||
> You may also be interested in [Residue](https://github.com/muflihun/residue/) logging server.
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
@ -124,7 +125,7 @@ Why yet another library? Well, answer is pretty straight forward, use it as you
|
||||
### Features at a glance
|
||||
Easylogging++ is feature-rich containing many features that both typical and advanced developer will require while writing a software;
|
||||
* [Highly configurable](#configuration)
|
||||
* [Extendable](#log-dispatch-callback)
|
||||
* [Extendable](#extending-library)
|
||||
* Extremely fast
|
||||
* [Thread](#multi-threading) and type safe
|
||||
* [Cross-platform](#compatibility)
|
||||
@ -436,7 +437,7 @@ int main(void) {
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
###Logging Flags
|
||||
### Logging Flags
|
||||
Form some parts of logging you can set logging flags; here are flags supported:
|
||||
|
||||
| Flag | Description |
|
||||
@ -456,6 +457,7 @@ Form some parts of logging you can set logging flags; here are flags supported:
|
||||
| `CreateLoggerAutomatically (4096)` | Creates logger automatically when not available. |
|
||||
| `AutoSpacing (8192)` | Automatically adds spaces. E.g, `LOG(INFO) << "DODGE" << "THIS!";` will output "DODGE THIS!"|
|
||||
| `FixedTimeFormat (16384)` | Applicable to performace tracking only - this prevents formatting time. E.g, `1001 ms` will be logged as is, instead of formatting it as `1.01 sec`|
|
||||
| `IgnoreSigInt (32768)` | When application crashes ignore Interruption signal |
|
||||
|
||||
You can set/unset these flags by using static `el::Loggers::addFlag` and `el::Loggers::removeFlag`. You can check to see if certain flag is available by using `el::Loggers::hasFlag`, all these functions take strongly-typed enum `el::LoggingFlag`
|
||||
|
||||
@ -482,7 +484,11 @@ Following table will explain all command line arguments that you may use to defi
|
||||
### Configuration Macros
|
||||
Some of logging options can be set by macros, this is a thoughtful decision, for example if we have `ELPP_THREAD_SAFE` defined, all the thread-safe functionalities are enabled otherwise disabled (making sure over-head of thread-safety goes with it). To make it easy to remember and prevent possible conflicts, all the macros start with `ELPP_`
|
||||
|
||||
NOTE: All the macros either need to be defined before `#include "easylogging++"` - but this gets hard and unreadable if project is getting bigger so we recommend you define all these macros using `-D` option of compiler, for example in case of `g++` you will do `g++ source.cpp ... -DELPP_SYSLOG -DELPP_THREAD_SAFE ...`
|
||||
**NOTE:** All the macros can be defined in one of the following ways:
|
||||
|
||||
1. Define macros using `-D` option of compiler, for example in case of `g++` you will do `g++ source.cpp ... -DELPP_SYSLOG -DELPP_THREAD_SAFE ...` (**recommended way**)
|
||||
|
||||
2. Define macros inside `"easylogging++.h"` ([defining macros in other files won't work](https://github.com/muflihun/easyloggingpp/issues/590#issuecomment-346753951))
|
||||
|
||||
| Macro Name | Description |
|
||||
|------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
@ -503,7 +509,7 @@ NOTE: All the macros either need to be defined before `#include "easylogging++"`
|
||||
| `ELPP_FORCE_ENV_VAR_FROM_BASH` | If environment variable could not be found, force using alternative bash command to find value, e.g, `whoami` for username. (DO NOT USE THIS MACRO WITH `LD_PRELOAD` FOR LIBRARIES THAT ARE ALREADY USING Easylogging++ OR YOU WILL END UP IN STACK OVERFLOW FOR PROCESSES (`popen`) (see [issue #87](https://github.com/muflihun/easyloggingpp/issues/87) for details)) |
|
||||
| `ELPP_DEFAULT_LOG_FILE` | Full filename where you want initial files to be created. You need to embed value of this macro with quotes, e.g, `-DELPP_DEFAULT_LOG_FILE='"logs/el.gtest.log"'` Note the double quotes inside single quotes, double quotes are the values for `const char*` and single quotes specifies value of macro |
|
||||
| `ELPP_NO_LOG_TO_FILE` | Disable logging to file initially|
|
||||
| `ELPP_NO_DEFAULT_LOG_FILE` | If you dont want to initialize library with default log file, define this macro. But be sure to configure your logger with propery log filename or you will end up getting heaps of errors when trying to log to file (and `TO_FILE` is configured to `true`) |
|
||||
| `ELPP_NO_DEFAULT_LOG_FILE` | If you dont want to initialize library with default log file, define this macro. This will log to null device for unix and windows. In other platforms you may get error and you will need to use `ELPP_DEFAULT_LOG_FILE`. (PR for other platform's null devices are most welcomed) |
|
||||
| `ELPP_FRESH_LOG_FILE` | Never appends log file whenever log file is created (Use with care as it may cause some unexpected result for some users) |
|
||||
| `ELPP_DEBUG_ERRORS` | If you wish to find out internal errors raised by Easylogging++ that can be because of configuration or something else, you can enable them by defining this macro. You will get your errors on standard output i.e, terminal or command prompt. |
|
||||
| `ELPP_DISABLE_CUSTOM_FORMAT_SPECIFIERS` | Forcefully disables custom format specifiers |
|
||||
@ -515,6 +521,7 @@ NOTE: All the macros either need to be defined before `#include "easylogging++"`
|
||||
| `ELPP_NO_CHECK_MACROS` | Do not define the *CHECK* macros |
|
||||
| `ELPP_NO_DEBUG_MACROS` | Do not define the *DEBUG* macros |
|
||||
| `ELPP_UTC_DATETIME` | Uses UTC time instead of local time (essentially uses `gmtime` instead of `localtime` and family functions)
|
||||
| `ELPP_NO_GLOBAL_LOCK` | Do not lock the whole storage on dispatch. This should be used with care. See [issue #580](https://github.com/muflihun/easyloggingpp/issues/580)|
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
@ -763,7 +770,7 @@ Although this is a rare situation but if you wish to get list of all the logger
|
||||
### Sharing Logging Repository
|
||||
For advance logging, you can share your logging repositories to shared or static libraries, or even from library to application. This is rare case but a very good example is as follows;
|
||||
|
||||
Let's say we have an application that uses easylogging++ and has it's own configuration, now you are importing library that uses easylogging++ and wants to access logging repository of main application. You can do this using two ways;
|
||||
Let's say we have an application that uses easylogging++ and has its own configuration, now you are importing library that uses easylogging++ and wants to access logging repository of main application. You can do this using two ways;
|
||||
|
||||
* Instead of using `INITIALIZE_EASYLOGGINGPP` you use `SHARE_EASYLOGGINGPP(access-function-to-repository)`
|
||||
* Instead of using `INITIALIZE_EASYLOGGINGPP` you use `INITIALIZE_NULL_EASYLOGGINGPP` and then `el::Helpers::setStorage(el::base::type::StoragePointer)`
|
||||
@ -922,9 +929,9 @@ In order to install this handler, use `void Helpers::installPerformanceTrackingC
|
||||
### Log File Rotating
|
||||
Easylogging++ has ability to roll out (or throw away / rotate) log files if they reach certain limit. You can configure this by setting `Max_Log_File_Size`. See Configuration section above.
|
||||
|
||||
If you are having failure in log-rollout, you may have failed to add flag i.e, `el::LoggingFlags::StrictLogFileSizeCheck`.
|
||||
Rollout checking happens when Easylogging++ flushes the log file, or, if you have added the flag `el::LoggingFlags::StrictLogFileSizeCheck`, at each log output.
|
||||
|
||||
This feature has it's own section in this reference manual because you can do stuffs with the file being thrown away. This is useful, for example if you wish to back this file up etc.
|
||||
This feature has its own section in this reference manual because you can do stuffs with the file being thrown away. This is useful, for example if you wish to back this file up etc.
|
||||
This can be done by using `el::Helpers::installPreRollOutCallback(const PreRollOutCallback& handler)` where `PreRollOutCallback` is typedef of type `std::function<void(const char*, std::size_t)>`. Please note following if you are using this feature
|
||||
|
||||
There is a [sample](/samples/STL/logrotate.cpp) available that you can use as basis.
|
||||
@ -1021,7 +1028,7 @@ Easylogging++ supports CHECK macros, with these macros you can quickly check whe
|
||||
| `CHECK_GT(a, b)` | Greater than e.g, `CHECK_GT(2, 1) << "How 2 is not greater than 1?";` |
|
||||
| `CHECK_LE(a, b)` | Less than or equal e.g, `CHECK_LE(1, 1) << "1 is not equal or less than 1";` |
|
||||
| `CHECK_GE(a, b)` | Greater than or equal e.g, `CHECK_GE(1, 1) << "1 is not equal or greater than 1";` |
|
||||
| `CHECK_NOTNULL(pointer)` | Ensures pointer is not null - if OK returns pointer e.g, `explicit MyClass(Obj* obj) : m_obj(CHECK_NOT_NULL(obj)) {}` |
|
||||
| `CHECK_NOTNULL(pointer)` | Ensures pointer is not null. This function does not return anything |
|
||||
| `CHECK_STREQ(str1, str2)` | C-string equality (case-sensitive) e.g, `CHECK_STREQ(argv[1], "0") << "First arg cannot be 0";` |
|
||||
| `CHECK_STRNE(str1, str2)` | C-string inequality (case-sensitive) e.g, `CHECK_STRNE(username1, username2) << "Usernames cannot be same";` |
|
||||
| `CHECK_STRCASEEQ(str1, str2)` | C-string inequality (*case-insensitive*) e.g, `CHECK_CASESTREQ(argv[1], "Z") << "First arg cannot be 'z' or 'Z'";` |
|
||||
@ -1170,6 +1177,10 @@ You may also have a look at wxWidgets sample
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
### Extending Library
|
||||
You can extend this library using various callback handlers and inheritable classes.
|
||||
|
||||
A perfect example of using these features is the logging server built with this library. It's called [Residue](https://github.com/muflihun/residue/) that is feature rich. In fact, you may be interested in using that instead of this library for your medium to large sized projects.
|
||||
|
||||
#### Logging Your Own Class
|
||||
|
||||
You can log your own classes by extending `el::Loggable` class and implementing pure-virtual function `void log(std::ostream& os) const`. Following example shows a good way to extend a class.
|
||||
@ -1266,6 +1277,80 @@ If you have not set flag `LoggingFlag::StrictLogFileSizeCheck` for some reason,
|
||||
### Log Dispatch Callback
|
||||
If you wish to capture log message right after it is dispatched, you can do so by having a class that extends `el::LogDispatchCallback` and implement the pure-virtual functions, then install it at anytime using `el::Helpers::installLogDispatchCallback<T>(const std::string&)`. If you wish to uninstall a pre-installed handler with same ID, you can do so by using `el::Helpers::uninstallLogDispatchCallback<T>(const std::string&)`
|
||||
|
||||
You can use this feature to send it to custom destinations e.g, log stash or TCP client etc.
|
||||
|
||||
You can also look at [send-to-network](/samples/send-to-network) sample for practical usage of this.
|
||||
|
||||
```c++
|
||||
// samples/send-to-network/network-logger.cpp
|
||||
|
||||
#include "easylogging++.h"
|
||||
|
||||
#include <boost/asio.hpp>
|
||||
|
||||
INITIALIZE_EASYLOGGINGPP
|
||||
|
||||
|
||||
class Client
|
||||
{
|
||||
boost::asio::io_service* io_service;
|
||||
boost::asio::ip::tcp::socket socket;
|
||||
|
||||
public:
|
||||
Client(boost::asio::io_service* svc, const std::string& host, const std::string& port)
|
||||
: io_service(svc), socket(*io_service)
|
||||
{
|
||||
boost::asio::ip::tcp::resolver resolver(*io_service);
|
||||
boost::asio::ip::tcp::resolver::iterator endpoint = resolver.resolve(boost::asio::ip::tcp::resolver::query(host, port));
|
||||
boost::asio::connect(this->socket, endpoint);
|
||||
};
|
||||
|
||||
void send(std::string const& message) {
|
||||
socket.send(boost::asio::buffer(message));
|
||||
}
|
||||
};
|
||||
|
||||
class NetworkDispatcher : public el::LogDispatchCallback
|
||||
{
|
||||
public:
|
||||
void updateServer(const std::string& host, int port) {
|
||||
m_client = std::unique_ptr<Client>(new Client(&m_svc, host, std::to_string(port)));
|
||||
}
|
||||
protected:
|
||||
void handle(const el::LogDispatchData* data) noexcept override {
|
||||
m_data = data;
|
||||
// Dispatch using default log builder of logger
|
||||
dispatch(m_data->logMessage()->logger()->logBuilder()->build(m_data->logMessage(),
|
||||
m_data->dispatchAction() == el::base::DispatchAction::NormalLog));
|
||||
}
|
||||
private:
|
||||
const el::LogDispatchData* m_data;
|
||||
boost::asio::io_service m_svc;
|
||||
std::unique_ptr<Client> m_client;
|
||||
|
||||
void dispatch(el::base::type::string_t&& logLine) noexcept
|
||||
{
|
||||
m_client->send(logLine);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
int main() {
|
||||
el::Helpers::installLogDispatchCallback<NetworkDispatcher>("NetworkDispatcher");
|
||||
// you can uninstall default one by
|
||||
// el::Helpers::uninstallLogDispatchCallback<el::base::DefaultLogDispatchCallback>("DefaultLogDispatchCallback");
|
||||
// Set server params
|
||||
NetworkDispatcher* dispatcher = el::Helpers::logDispatchCallback<NetworkDispatcher>("NetworkDispatcher");
|
||||
dispatcher->setEnabled(true);
|
||||
dispatcher->updateServer("127.0.0.1", 9090);
|
||||
|
||||
// Start logging and normal program...
|
||||
LOG(INFO) << "First network log";
|
||||
|
||||
// You can even use a different logger, say "network" and send using a different log pattern
|
||||
}
|
||||
```
|
||||
|
||||
> DO NOT LOG ANYTHING IN THIS HANDLER OR YOU WILL END UP IN INFINITE-LOOP
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
@ -1322,7 +1407,7 @@ Easylogging++ requires a decent C++0x complient compiler. Some compilers known t
|
||||
|
||||
| ***** | Compiler/Platform | Notes |
|
||||
|---------|---------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
|![gcc] | GCC 4.7+ | Stack trace logging. Very close to support GCC 4.6 if it had supported strong enum types casting to underlying type. It causes internal compiler error. |
|
||||
|![gcc] | GCC 4.6.4+ | Stack trace logging. Very close to support GCC 4.6.0 if it had supported strong enum types casting to underlying type. It causes internal compiler error. |
|
||||
|![llvm] | Clang++ 3.1+ | Stack trace logging only with gcc compliant. |
|
||||
|![intel] | Intel C++ 13.0+ | Workarounds to support: Use if instead of switch on strong enum type. No `final` keyword etc. Stack trace logging only with gcc compliant |
|
||||
|![vcpp] | Visual C++ 11.0+ | Tested with VS2012, VS2013; Use of argument templates instead of variadic templates. CRT warnings control. No stack trace logging. |
|
||||
@ -1348,6 +1433,7 @@ Operating systems that have been tested are shown in table below. Easylogging++
|
||||
|![android] | Android | Tested with C4droid (g++) on Galaxy Tab 2 |
|
||||
|![raspberrypi] | RaspberryPi 7.6 | Tested with 7.6.2-1.1 (gcc version 4.9.1 (Raspbian 4.9.1-1)) by contributor |
|
||||
|![solaris] | Solaris i86 | Tested by contributor |
|
||||
|![aix] | IBM AIX | Support added by contributor |
|
||||
|
||||
Easylogging++ has also been tested with following C++ libraries;
|
||||
|
||||
@ -1360,14 +1446,32 @@ Easylogging++ has also been tested with following C++ libraries;
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
## Build Matrix
|
||||
|
||||
| Branch | Platform | Build Status |
|
||||
| -------- |:------------:|:------------:|
|
||||
| `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `clang++` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-4.9` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-5` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-6` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-7` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `clang++` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-4.9` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-5` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-6` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
| `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-7` | [](https://travis-ci.org/muflihun/easyloggingpp) |
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
# Licence
|
||||
```
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2017 muflihun.com
|
||||
Copyright (c) 2012-2018 Zuhd Web Services
|
||||
Copyright (c) 2012-2018 @abumusamq
|
||||
|
||||
https://github.com/muflihun/easyloggingpp
|
||||
https://labs.muflihun.com
|
||||
https://github.com/zuhd-org/
|
||||
https://zuhd.org
|
||||
https://muflihun.com
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
@ -1398,38 +1502,38 @@ Icons used in this manual (in compatibility section) are solely for information
|
||||
|
||||
[![top] Goto Top](#table-of-contents)
|
||||
|
||||
[banner]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/banner.png?v=4
|
||||
[ubuntu]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/ubuntu.png?v=2
|
||||
[mint]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/linux-mint.png?v=2
|
||||
[freebsd]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/free-bsd.png?v=2
|
||||
[sl]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/scientific-linux.png?v=2
|
||||
[fedora]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/fedora.png?v=3
|
||||
[mac]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/mac-osx.png?v=2
|
||||
[winxp]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/windowsxp.png?v=2
|
||||
[win7]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/windows7.png?v=2
|
||||
[win8]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/windows8.png?v=2
|
||||
[win10]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/windows10.png?v=2
|
||||
[qt]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/qt.png?v=3
|
||||
[boost]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/boost.png?v=3
|
||||
[wxwidgets]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/wxwidgets.png?v=3
|
||||
[devcpp]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/devcpp.png?v=3
|
||||
[gtkmm]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/gtkmm.png?v=3
|
||||
[tdm]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/tdm.png?v=3
|
||||
[raspberrypi]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/raspberry-pi.png?v=3
|
||||
[solaris]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/solaris.png?v=3
|
||||
[banner]: https://muflihun.github.io/easyloggingpp/images/banner.png?v=4
|
||||
[ubuntu]: https://muflihun.github.io/easyloggingpp/images/icons/ubuntu.png?v=2
|
||||
[mint]: https://muflihun.github.io/easyloggingpp/images/icons/linux-mint.png?v=2
|
||||
[freebsd]: https://muflihun.github.io/easyloggingpp/images/icons/free-bsd.png?v=2
|
||||
[sl]: https://muflihun.github.io/easyloggingpp/images/icons/scientific-linux.png?v=2
|
||||
[fedora]: https://muflihun.github.io/easyloggingpp/images/icons/fedora.png?v=3
|
||||
[mac]: https://muflihun.github.io/easyloggingpp/images/icons/mac-osx.png?v=2
|
||||
[winxp]: https://muflihun.github.io/easyloggingpp/images/icons/windowsxp.png?v=2
|
||||
[win7]: https://muflihun.github.io/easyloggingpp/images/icons/windows7.png?v=2
|
||||
[win8]: https://muflihun.github.io/easyloggingpp/images/icons/windows8.png?v=2
|
||||
[win10]: https://muflihun.github.io/easyloggingpp/images/icons/windows10.png?v=2
|
||||
[qt]: https://muflihun.github.io/easyloggingpp/images/icons/qt.png?v=3
|
||||
[boost]: https://muflihun.github.io/easyloggingpp/images/icons/boost.png?v=3
|
||||
[wxwidgets]: https://muflihun.github.io/easyloggingpp/images/icons/wxwidgets.png?v=3
|
||||
[devcpp]: https://muflihun.github.io/easyloggingpp/images/icons/devcpp.png?v=3
|
||||
[gtkmm]: https://muflihun.github.io/easyloggingpp/images/icons/gtkmm.png?v=3
|
||||
[tdm]: https://muflihun.github.io/easyloggingpp/images/icons/tdm.png?v=3
|
||||
[raspberrypi]: https://muflihun.github.io/easyloggingpp/images/icons/raspberry-pi.png?v=3
|
||||
[solaris]: https://muflihun.github.io/easyloggingpp/images/icons/solaris.png?v=3
|
||||
[aix]: https://muflihun.github.io/easyloggingpp/images/icons/aix.png?v=4
|
||||
|
||||
|
||||
[gcc]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/gcc.png?v=4
|
||||
[mingw]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/mingw.png?v=2
|
||||
[cygwin]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/cygwin.png?v=2
|
||||
[vcpp]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/vcpp.png?v=2
|
||||
[llvm]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/llvm.png?v=2
|
||||
[intel]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/intel.png?v=2
|
||||
[android]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/icons/android.png?v=2
|
||||
[manual]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/help.png?v=3
|
||||
[download]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/download.png?v=2
|
||||
[samples]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/sample.png?v=2
|
||||
[notes]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/notes.png?v=4
|
||||
[top]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/up.png?v=4
|
||||
[www]: https://raw.githubusercontent.com/muflihun/easyloggingpp.muflihun.com/master/images/logo-www.png?v=6
|
||||
|
||||
[gcc]: https://muflihun.github.io/easyloggingpp/images/icons/gcc.png?v=4
|
||||
[mingw]: https://muflihun.github.io/easyloggingpp/images/icons/mingw.png?v=2
|
||||
[cygwin]: https://muflihun.github.io/easyloggingpp/images/icons/cygwin.png?v=2
|
||||
[vcpp]: https://muflihun.github.io/easyloggingpp/images/icons/vcpp.png?v=2
|
||||
[llvm]: https://muflihun.github.io/easyloggingpp/images/icons/llvm.png?v=2
|
||||
[intel]: https://muflihun.github.io/easyloggingpp/images/icons/intel.png?v=2
|
||||
[android]: https://muflihun.github.io/easyloggingpp/images/icons/android.png?v=2
|
||||
[manual]: https://muflihun.github.io/easyloggingpp/images/help.png?v=3
|
||||
[download]: https://muflihun.github.io/easyloggingpp/images/download.png?v=2
|
||||
[samples]: https://muflihun.github.io/easyloggingpp/images/sample.png?v=2
|
||||
[notes]: https://muflihun.github.io/easyloggingpp/images/notes.png?v=4
|
||||
[top]: https://muflihun.github.io/easyloggingpp/images/up.png?v=4
|
||||
[www]: https://muflihun.github.io/easyloggingpp/images/logo-www.png?v=6
|
||||
|
||||
5
vendor/github.com/muflihun/easyloggingpp/cmake/FindEASYLOGGINGPP.cmake
generated
vendored
5
vendor/github.com/muflihun/easyloggingpp/cmake/FindEASYLOGGINGPP.cmake
generated
vendored
@ -6,9 +6,10 @@
|
||||
# If ${EASYLOGGINGPP_USE_STATIC_LIBS} is ON then static libs are searched.
|
||||
# In these cases ${EASYLOGGINGPP_LIBRARY} is also defined
|
||||
#
|
||||
# (c) 2017 Muflihun Labs
|
||||
# (c) 2017-2018 Zuhd Web Services
|
||||
#
|
||||
# https://github.com/muflihun/easyloggingpp
|
||||
# https://github.com/zuhd-org/easyloggingpp
|
||||
# https://zuhd.org
|
||||
# https://muflihun.com
|
||||
#
|
||||
|
||||
|
||||
6
vendor/github.com/muflihun/easyloggingpp/cmake/easyloggingpp.pc.cmakein
generated
vendored
Normal file
6
vendor/github.com/muflihun/easyloggingpp/cmake/easyloggingpp.pc.cmakein
generated
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
Name: easyloggingpp
|
||||
Description: Feature-rich single header C++ logging library
|
||||
Version: @ELPP_VERSION_STRING@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
includedir=@ELPP_INCLUDE_INSTALL_DIR@
|
||||
Cflags: -I${includedir}
|
||||
1
vendor/github.com/muflihun/easyloggingpp/samples/STL/.gitignore
generated
vendored
1
vendor/github.com/muflihun/easyloggingpp/samples/STL/.gitignore
generated
vendored
@ -1,2 +1,3 @@
|
||||
bin/*
|
||||
logs/*
|
||||
myeasylog.log
|
||||
|
||||
5
vendor/github.com/muflihun/easyloggingpp/samples/STL/compile.sh
generated
vendored
5
vendor/github.com/muflihun/easyloggingpp/samples/STL/compile.sh
generated
vendored
@ -10,6 +10,7 @@ macro="$macro -DELPP_LOG_UNORDERED_MAP"
|
||||
macro="$macro -DELPP_FEATURE_CRASH_LOG"
|
||||
macro="$macro -DELPP_LOGGING_FLAGS_FROM_ARG"
|
||||
macro="$macro -DELPP_FEATURE_ALL"
|
||||
macro="$macro -DELPP_NO_GLOBAL_LOCK"
|
||||
# macro="$macro -DELPP_DEFAULT_LOG_FILE=\"/a/path/that/does/not/exist/f.log\""
|
||||
|
||||
if [ "$2" = "" ];then
|
||||
@ -18,7 +19,7 @@ else
|
||||
COMPILER=$2
|
||||
fi
|
||||
|
||||
CXX_STD='-std=c++0x -pthread'
|
||||
CXX_STD='-std=c++11'
|
||||
|
||||
if [ "$FILE" = "" ]; then
|
||||
echo "Please provide filename to compile"
|
||||
@ -27,7 +28,7 @@ fi
|
||||
|
||||
echo "Compiling... [$FILE]"
|
||||
|
||||
COMPILE_LINE="$COMPILER $FILE easylogging++.cc -o bin/$FILE.bin $macro $CXX_STD -Wall -Wextra -pedantic -pedantic-errors -Werror -Wfatal-errors -Wundef -Wunused"
|
||||
COMPILE_LINE="$COMPILER $FILE easylogging++.cc -o bin/$FILE.bin $macro $CXX_STD -pthread -Wall -Wextra -pedantic -pedantic-errors -Werror -Wfatal-errors -Wundef -Wunused"
|
||||
|
||||
echo " $COMPILE_LINE"
|
||||
|
||||
|
||||
4
vendor/github.com/muflihun/easyloggingpp/samples/STL/logger-log-functions.cpp
generated
vendored
4
vendor/github.com/muflihun/easyloggingpp/samples/STL/logger-log-functions.cpp
generated
vendored
@ -16,9 +16,12 @@ int main(int argc, char** argv) {
|
||||
|
||||
el::Logger* defaultLogger = el::Loggers::getLogger("default");
|
||||
|
||||
LOG(INFO) << "Blah";
|
||||
|
||||
std::vector<int> i;
|
||||
i.push_back(1);
|
||||
i.push_back(2);
|
||||
defaultLogger->info("simple %v", "msg");
|
||||
defaultLogger->warn("My first ultimate log message %v %v %v", 123, 222, i);
|
||||
|
||||
// Escaping
|
||||
@ -27,5 +30,6 @@ int main(int argc, char** argv) {
|
||||
defaultLogger->verbose(1, "test verbose");
|
||||
defaultLogger->verbose(1, "test verbose with args %v", 2);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
39
vendor/github.com/muflihun/easyloggingpp/samples/STL/multi-loggers-to-same-file.cpp
generated
vendored
Normal file
39
vendor/github.com/muflihun/easyloggingpp/samples/STL/multi-loggers-to-same-file.cpp
generated
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
//
|
||||
// This file is part of Easylogging++ samples
|
||||
//
|
||||
// Revision 1.0
|
||||
//
|
||||
|
||||
#include <thread>
|
||||
#include "easylogging++.h"
|
||||
|
||||
INITIALIZE_EASYLOGGINGPP
|
||||
|
||||
void def() {
|
||||
for (int i = 0; i < 1000; ++i)
|
||||
CLOG(INFO, "first") << "This is from first " << i;
|
||||
}
|
||||
|
||||
void second() {
|
||||
for (int i = 0; i < 1000; ++i)
|
||||
CLOG(INFO, "second") << "This is from second" << i;
|
||||
}
|
||||
|
||||
int main(int,char**){
|
||||
el::Loggers::addFlag(el::LoggingFlag::CreateLoggerAutomatically);
|
||||
|
||||
el::Configurations confFromFile("../default-logger.conf");
|
||||
|
||||
el::Loggers::setDefaultConfigurations(confFromFile, true);
|
||||
|
||||
LOG(INFO)<<"The program has started!";
|
||||
|
||||
std::thread t1(def);
|
||||
std::thread t2(second);
|
||||
|
||||
t1.join();
|
||||
t2.join();
|
||||
|
||||
LOG(INFO) << "Shutting down.";
|
||||
return 0;
|
||||
}
|
||||
51
vendor/github.com/muflihun/easyloggingpp/samples/STL/multi-loggers-with-async.cpp
generated
vendored
Normal file
51
vendor/github.com/muflihun/easyloggingpp/samples/STL/multi-loggers-with-async.cpp
generated
vendored
Normal file
@ -0,0 +1,51 @@
|
||||
//
|
||||
// This file is part of Easylogging++ samples
|
||||
//
|
||||
// Revision 1.0
|
||||
//
|
||||
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <future>
|
||||
#include "easylogging++.h"
|
||||
|
||||
INITIALIZE_EASYLOGGINGPP
|
||||
|
||||
void f() {
|
||||
std::async(std::launch::async, [&]() {
|
||||
std::cout << "[internal] inside async()" << std::endl;
|
||||
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||
LOG(INFO) << "This is from async";
|
||||
});
|
||||
}
|
||||
|
||||
class MyHandler : public el::LogDispatchCallback {
|
||||
public:
|
||||
void handle(const el::LogDispatchData* d) {
|
||||
std::cout << "Message: " << d->logMessage()->message() << " [logger: " << d->logMessage()->logger()->id() << "]" << std::endl;
|
||||
if (d->logMessage()->logger()->id() != "default") {
|
||||
std::cout << "[internal] calling f()" << std::endl;
|
||||
f();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
int main(int,char**){
|
||||
el::Loggers::addFlag(el::LoggingFlag::CreateLoggerAutomatically);
|
||||
// el::Helpers::uninstallLogDispatchCallback<el::base::DefaultLogDispatchCallback>("DefaultLogDispatchCallback");
|
||||
el::Helpers::installLogDispatchCallback<MyHandler>("MyHandler");
|
||||
|
||||
LOG(INFO)<<"The program has started!";
|
||||
CLOG(INFO, "frommain") << "THis is another";
|
||||
|
||||
std::thread t1([](){
|
||||
LOG(INFO) << "This is from thread";
|
||||
});
|
||||
|
||||
t1.join();
|
||||
|
||||
LOG(INFO) << "Shutting down.";
|
||||
return 0;
|
||||
}
|
||||
2
vendor/github.com/muflihun/easyloggingpp/samples/default-logger.conf
generated
vendored
2
vendor/github.com/muflihun/easyloggingpp/samples/default-logger.conf
generated
vendored
@ -1,5 +1,5 @@
|
||||
* GLOBAL:
|
||||
FORMAT = "%datetime | %level | %msg"
|
||||
FORMAT = "%datetime | %level | %logger | %msg"
|
||||
FILENAME = "/tmp/logs/myeasylog-configuration.cpp.log"
|
||||
ENABLED = true
|
||||
TO_FILE = true
|
||||
|
||||
10
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/README.md
generated
vendored
10
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/README.md
generated
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
You can use this sample to send your log messages to network as requested by many users. We are not able to add it to the library as this will require some stuffs to choose what network library to use.
|
||||
|
||||
This sample uses `asio` in `boost_system`
|
||||
This sample uses `boost::asio`
|
||||
|
||||
## Run
|
||||
|
||||
@ -13,17 +13,15 @@ mkdir bin
|
||||
sh compile.sh network-logger.sh
|
||||
```
|
||||
|
||||
Run a server (we are using netcat on mac for test purposes) on a different terminal
|
||||
Run a server (we are using netcat on mac for demo) on a new tab in your terminal
|
||||
|
||||
```
|
||||
nc -l 9090
|
||||
nc -k -l 9090
|
||||
```
|
||||
|
||||
Now run `./bin/network-logger`
|
||||
|
||||
|
||||
## More
|
||||
|
||||
You may need `ELPP_NO_LOG_TO_FILE` and `ELPP_NO_DEFAULT_LOG_FILE` depending on your needs.
|
||||
|
||||
Please refer to [doc](https://github.com/muflihun/easyloggingpp#configuration-macros) for further details on macros
|
||||
|
||||
|
||||
6
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/compile.sh
generated
vendored
6
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/compile.sh
generated
vendored
@ -17,7 +17,11 @@ fi
|
||||
|
||||
echo "Compiling... [$FILE]"
|
||||
|
||||
COMPILE_LINE="$COMPILER $FILE easylogging++.cc -o bin/$FILE.bin $CXX_STD -std=c++11 -pthread -I /opt/local/include -L/opt/local/lib -lboost_system -Wno-deprecated-declarations"
|
||||
if [ ! -d "bin" ];then
|
||||
mkdir bin
|
||||
fi;
|
||||
|
||||
COMPILE_LINE="$COMPILER $FILE easylogging++.cc -o bin/$FILE.bin $CXX_STD -pthread -lboost_system"
|
||||
|
||||
echo " $COMPILE_LINE"
|
||||
|
||||
|
||||
39
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/network-logger.cpp
generated
vendored
39
vendor/github.com/muflihun/easyloggingpp/samples/send-to-network/network-logger.cpp
generated
vendored
@ -6,7 +6,7 @@
|
||||
// Revision 1.0
|
||||
// @author mkhan3189
|
||||
//
|
||||
// Compile: g++ network-logger.cpp easylogging++.cc -o bin/network-logger.cpp.bin -std=c++11 -pthread -I /opt/local/include -L/opt/local/lib -lboost_system -Wno-deprecated-declarations
|
||||
// Compile: sh compile.sh network-logger.cpp
|
||||
//
|
||||
|
||||
#include "easylogging++.h"
|
||||
@ -16,16 +16,16 @@
|
||||
INITIALIZE_EASYLOGGINGPP
|
||||
|
||||
|
||||
// Following Client struct adapted from http://stackoverflow.com/questions/27672591/boost-asio-send-and-receive-messages
|
||||
struct Client
|
||||
class Client
|
||||
{
|
||||
boost::asio::io_service& io_service;
|
||||
boost::asio::io_service* io_service;
|
||||
boost::asio::ip::tcp::socket socket;
|
||||
|
||||
Client(boost::asio::io_service& svc, std::string const& host, std::string const& port)
|
||||
: io_service(svc), socket(io_service)
|
||||
public:
|
||||
Client(boost::asio::io_service* svc, const std::string& host, const std::string& port)
|
||||
: io_service(svc), socket(*io_service)
|
||||
{
|
||||
boost::asio::ip::tcp::resolver resolver(io_service);
|
||||
boost::asio::ip::tcp::resolver resolver(*io_service);
|
||||
boost::asio::ip::tcp::resolver::iterator endpoint = resolver.resolve(boost::asio::ip::tcp::resolver::query(host, port));
|
||||
boost::asio::connect(this->socket, endpoint);
|
||||
};
|
||||
@ -38,16 +38,11 @@ struct Client
|
||||
class NetworkDispatcher : public el::LogDispatchCallback
|
||||
{
|
||||
public:
|
||||
// Setters
|
||||
void setHost(const std::string& host) {
|
||||
m_host = host;
|
||||
}
|
||||
void setPort(int port) {
|
||||
m_port = port;
|
||||
void updateServer(const std::string& host, int port) {
|
||||
m_client = std::unique_ptr<Client>(new Client(&m_svc, host, std::to_string(port)));
|
||||
}
|
||||
protected:
|
||||
void handle(const el::LogDispatchData* data) noexcept override
|
||||
{
|
||||
void handle(const el::LogDispatchData* data) noexcept override {
|
||||
m_data = data;
|
||||
// Dispatch using default log builder of logger
|
||||
dispatch(m_data->logMessage()->logger()->logBuilder()->build(m_data->logMessage(),
|
||||
@ -55,26 +50,24 @@ protected:
|
||||
}
|
||||
private:
|
||||
const el::LogDispatchData* m_data;
|
||||
std::string m_host;
|
||||
int m_port;
|
||||
boost::asio::io_service m_svc;
|
||||
std::unique_ptr<Client> m_client;
|
||||
|
||||
void dispatch(el::base::type::string_t&& logLine) noexcept
|
||||
{
|
||||
boost::asio::io_service svc;
|
||||
Client client(svc, m_host, std::to_string(m_port));
|
||||
|
||||
client.send(logLine);
|
||||
m_client->send(logLine);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
int main() {
|
||||
el::Helpers::installLogDispatchCallback<NetworkDispatcher>("NetworkDispatcher");
|
||||
// you can uninstall default one by
|
||||
// el::Helpers::uninstallLogDispatchCallback<el::base::DefaultLogDispatchCallback>("DefaultLogDispatchCallback");
|
||||
// Set server params
|
||||
NetworkDispatcher* dispatcher = el::Helpers::logDispatchCallback<NetworkDispatcher>("NetworkDispatcher");
|
||||
dispatcher->setEnabled(true);
|
||||
dispatcher->setHost("127.0.0.1");
|
||||
dispatcher->setPort(9090);
|
||||
dispatcher->updateServer("127.0.0.1", 9090);
|
||||
|
||||
// Start logging and normal program...
|
||||
LOG(INFO) << "First network log";
|
||||
|
||||
280
vendor/github.com/muflihun/easyloggingpp/src/easylogging++.cc
generated
vendored
280
vendor/github.com/muflihun/easyloggingpp/src/easylogging++.cc
generated
vendored
@ -1,16 +1,16 @@
|
||||
//
|
||||
// Bismillah ar-Rahmaan ar-Raheem
|
||||
//
|
||||
// Easylogging++ v9.95.0
|
||||
// Easylogging++ v9.96.7
|
||||
// Cross-platform logging library for C++ applications
|
||||
//
|
||||
// Copyright (c) 2017 muflihun.com
|
||||
// Copyright (c) 2012-2018 Zuhd Web Services
|
||||
// Copyright (c) 2012-2018 @abumusamq
|
||||
//
|
||||
// This library is released under the MIT Licence.
|
||||
// http://labs.muflihun.com/easyloggingpp/licence.php
|
||||
// https://github.com/zuhd-org/easyloggingpp/blob/master/LICENSE
|
||||
//
|
||||
// https://github.com/muflihun/easyloggingpp
|
||||
// https://muflihun.github.io/easyloggingpp
|
||||
// https://zuhd.org
|
||||
// http://muflihun.com
|
||||
//
|
||||
|
||||
@ -22,8 +22,95 @@ INITIALIZE_EASYLOGGINGPP
|
||||
|
||||
namespace el {
|
||||
|
||||
// el::base::utils
|
||||
// el::base
|
||||
namespace base {
|
||||
// el::base::consts
|
||||
namespace consts {
|
||||
|
||||
// Level log values - These are values that are replaced in place of %level format specifier
|
||||
// Extra spaces after format specifiers are only for readability purposes in log files
|
||||
static const base::type::char_t* kInfoLevelLogValue = ELPP_LITERAL("INFO");
|
||||
static const base::type::char_t* kDebugLevelLogValue = ELPP_LITERAL("DEBUG");
|
||||
static const base::type::char_t* kWarningLevelLogValue = ELPP_LITERAL("WARNING");
|
||||
static const base::type::char_t* kErrorLevelLogValue = ELPP_LITERAL("ERROR");
|
||||
static const base::type::char_t* kFatalLevelLogValue = ELPP_LITERAL("FATAL");
|
||||
static const base::type::char_t* kVerboseLevelLogValue =
|
||||
ELPP_LITERAL("VERBOSE"); // will become VERBOSE-x where x = verbose level
|
||||
static const base::type::char_t* kTraceLevelLogValue = ELPP_LITERAL("TRACE");
|
||||
static const base::type::char_t* kInfoLevelShortLogValue = ELPP_LITERAL("I");
|
||||
static const base::type::char_t* kDebugLevelShortLogValue = ELPP_LITERAL("D");
|
||||
static const base::type::char_t* kWarningLevelShortLogValue = ELPP_LITERAL("W");
|
||||
static const base::type::char_t* kErrorLevelShortLogValue = ELPP_LITERAL("E");
|
||||
static const base::type::char_t* kFatalLevelShortLogValue = ELPP_LITERAL("F");
|
||||
static const base::type::char_t* kVerboseLevelShortLogValue = ELPP_LITERAL("V");
|
||||
static const base::type::char_t* kTraceLevelShortLogValue = ELPP_LITERAL("T");
|
||||
// Format specifiers - These are used to define log format
|
||||
static const base::type::char_t* kAppNameFormatSpecifier = ELPP_LITERAL("%app");
|
||||
static const base::type::char_t* kLoggerIdFormatSpecifier = ELPP_LITERAL("%logger");
|
||||
static const base::type::char_t* kThreadIdFormatSpecifier = ELPP_LITERAL("%thread");
|
||||
static const base::type::char_t* kSeverityLevelFormatSpecifier = ELPP_LITERAL("%level");
|
||||
static const base::type::char_t* kSeverityLevelShortFormatSpecifier = ELPP_LITERAL("%levshort");
|
||||
static const base::type::char_t* kDateTimeFormatSpecifier = ELPP_LITERAL("%datetime");
|
||||
static const base::type::char_t* kLogFileFormatSpecifier = ELPP_LITERAL("%file");
|
||||
static const base::type::char_t* kLogFileBaseFormatSpecifier = ELPP_LITERAL("%fbase");
|
||||
static const base::type::char_t* kLogLineFormatSpecifier = ELPP_LITERAL("%line");
|
||||
static const base::type::char_t* kLogLocationFormatSpecifier = ELPP_LITERAL("%loc");
|
||||
static const base::type::char_t* kLogFunctionFormatSpecifier = ELPP_LITERAL("%func");
|
||||
static const base::type::char_t* kCurrentUserFormatSpecifier = ELPP_LITERAL("%user");
|
||||
static const base::type::char_t* kCurrentHostFormatSpecifier = ELPP_LITERAL("%host");
|
||||
static const base::type::char_t* kMessageFormatSpecifier = ELPP_LITERAL("%msg");
|
||||
static const base::type::char_t* kVerboseLevelFormatSpecifier = ELPP_LITERAL("%vlevel");
|
||||
static const char* kDateTimeFormatSpecifierForFilename = "%datetime";
|
||||
// Date/time
|
||||
static const char* kDays[7] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
|
||||
static const char* kDaysAbbrev[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
||||
static const char* kMonths[12] = { "January", "February", "March", "Apri", "May", "June", "July", "August",
|
||||
"September", "October", "November", "December"
|
||||
};
|
||||
static const char* kMonthsAbbrev[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
|
||||
static const char* kDefaultDateTimeFormat = "%Y-%M-%d %H:%m:%s,%g";
|
||||
static const char* kDefaultDateTimeFormatInFilename = "%Y-%M-%d_%H-%m";
|
||||
static const int kYearBase = 1900;
|
||||
static const char* kAm = "AM";
|
||||
static const char* kPm = "PM";
|
||||
// Miscellaneous constants
|
||||
|
||||
static const char* kNullPointer = "nullptr";
|
||||
#if ELPP_VARIADIC_TEMPLATES_SUPPORTED
|
||||
#endif // ELPP_VARIADIC_TEMPLATES_SUPPORTED
|
||||
static const base::type::VerboseLevel kMaxVerboseLevel = 9;
|
||||
static const char* kUnknownUser = "user";
|
||||
static const char* kUnknownHost = "unknown-host";
|
||||
|
||||
|
||||
//---------------- DEFAULT LOG FILE -----------------------
|
||||
|
||||
#if defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
# if ELPP_OS_UNIX
|
||||
static const char* kDefaultLogFile = "/dev/null";
|
||||
# elif ELPP_OS_WINDOWS
|
||||
static const char* kDefaultLogFile = "nul";
|
||||
# endif // ELPP_OS_UNIX
|
||||
#elif defined(ELPP_DEFAULT_LOG_FILE)
|
||||
static const char* kDefaultLogFile = ELPP_DEFAULT_LOG_FILE;
|
||||
#else
|
||||
static const char* kDefaultLogFile = "myeasylog.log";
|
||||
#endif // defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
|
||||
|
||||
#if !defined(ELPP_DISABLE_LOG_FILE_FROM_ARG)
|
||||
static const char* kDefaultLogFileParam = "--default-log-file";
|
||||
#endif // !defined(ELPP_DISABLE_LOG_FILE_FROM_ARG)
|
||||
#if defined(ELPP_LOGGING_FLAGS_FROM_ARG)
|
||||
static const char* kLoggingFlagsParam = "--logging-flags";
|
||||
#endif // defined(ELPP_LOGGING_FLAGS_FROM_ARG)
|
||||
static const char* kValidLoggerIdSymbols =
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._";
|
||||
static const char* kConfigurationComment = "##";
|
||||
static const char* kConfigurationLevel = "*";
|
||||
static const char* kConfigurationLoggerId = "--";
|
||||
}
|
||||
// el::base::utils
|
||||
namespace utils {
|
||||
|
||||
/// @brief Aborts application due with user-defined status
|
||||
@ -276,11 +363,7 @@ void Configurations::set(Configuration* conf) {
|
||||
|
||||
void Configurations::setToDefault(void) {
|
||||
setGlobally(ConfigurationType::Enabled, std::string("true"), true);
|
||||
#if !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
setGlobally(ConfigurationType::Filename, std::string(base::consts::kDefaultLogFile), true);
|
||||
#else
|
||||
ELPP_UNUSED(base::consts::kDefaultLogFile);
|
||||
#endif // !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
#if defined(ELPP_NO_LOG_TO_FILE)
|
||||
setGlobally(ConfigurationType::ToFile, std::string("false"), true);
|
||||
#else
|
||||
@ -309,9 +392,7 @@ void Configurations::setRemainingToDefault(void) {
|
||||
#else
|
||||
unsafeSetIfNotExist(Level::Global, ConfigurationType::Enabled, std::string("true"));
|
||||
#endif // defined(ELPP_NO_LOG_TO_FILE)
|
||||
#if !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
unsafeSetIfNotExist(Level::Global, ConfigurationType::Filename, std::string(base::consts::kDefaultLogFile));
|
||||
#endif // !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
unsafeSetIfNotExist(Level::Global, ConfigurationType::ToStandardOutput, std::string("true"));
|
||||
unsafeSetIfNotExist(Level::Global, ConfigurationType::SubsecondPrecision, std::string("3"));
|
||||
unsafeSetIfNotExist(Level::Global, ConfigurationType::PerformanceTracking, std::string("true"));
|
||||
@ -569,7 +650,6 @@ void Logger::configure(const Configurations& configurations) {
|
||||
if (m_typedConfigurations != nullptr) {
|
||||
Configurations* c = const_cast<Configurations*>(m_typedConfigurations->configurations());
|
||||
if (c->hasConfiguration(Level::Global, ConfigurationType::Filename)) {
|
||||
// This check is definitely needed for cases like ELPP_NO_DEFAULT_LOG_FILE
|
||||
flush();
|
||||
}
|
||||
}
|
||||
@ -613,10 +693,11 @@ void Logger::flush(Level level, base::type::fstream_t* fs) {
|
||||
}
|
||||
if (fs != nullptr) {
|
||||
fs->flush();
|
||||
std::map<Level, unsigned int>::iterator iter = m_unflushedCount.find(level);
|
||||
std::unordered_map<Level, unsigned int>::iterator iter = m_unflushedCount.find(level);
|
||||
if (iter != m_unflushedCount.end()) {
|
||||
iter->second = 0;
|
||||
}
|
||||
Helpers::validateFileRolling(this, level);
|
||||
}
|
||||
}
|
||||
|
||||
@ -675,10 +756,9 @@ std::size_t File::getSizeOfFile(base::type::fstream_t* fs) {
|
||||
if (fs == nullptr) {
|
||||
return 0;
|
||||
}
|
||||
std::streampos currPos = fs->tellg();
|
||||
fs->seekg(0, fs->end);
|
||||
// Since the file stream is appended to or truncated, the current
|
||||
// offset is the file size.
|
||||
std::size_t size = static_cast<std::size_t>(fs->tellg());
|
||||
fs->seekg(currPos);
|
||||
return size;
|
||||
}
|
||||
|
||||
@ -850,7 +930,7 @@ void Str::replaceFirstWithEscape(base::type::string_t& str, const base::type::st
|
||||
std::size_t foundAt = base::type::string_t::npos;
|
||||
while ((foundAt = str.find(replaceWhat, foundAt + 1)) != base::type::string_t::npos) {
|
||||
if (foundAt > 0 && str[foundAt - 1] == base::consts::kFormatSpecifierChar) {
|
||||
str.erase(foundAt > 0 ? foundAt - 1 : 0, 1);
|
||||
str.erase(foundAt - 1, 1);
|
||||
++foundAt;
|
||||
} else {
|
||||
str.replace(foundAt, replaceWhat.length(), replaceWith);
|
||||
@ -997,8 +1077,9 @@ const std::string OS::getBashOutput(const char* command) {
|
||||
char hBuff[4096];
|
||||
if (fgets(hBuff, sizeof(hBuff), proc) != nullptr) {
|
||||
pclose(proc);
|
||||
if (hBuff[strlen(hBuff) - 1] == '\n') {
|
||||
hBuff[strlen(hBuff) - 1] = '\0';
|
||||
const std::size_t buffLen = strlen(hBuff);
|
||||
if (buffLen > 0 && hBuff[buffLen - 1] == '\n') {
|
||||
hBuff[buffLen - 1] = '\0';
|
||||
}
|
||||
return std::string(hBuff);
|
||||
} else {
|
||||
@ -1272,7 +1353,7 @@ bool CommandLineArgs::hasParamWithValue(const char* paramKey) const {
|
||||
}
|
||||
|
||||
const char* CommandLineArgs::getParamValue(const char* paramKey) const {
|
||||
std::map<std::string, std::string>::const_iterator iter = m_paramsWithValue.find(std::string(paramKey));
|
||||
std::unordered_map<std::string, std::string>::const_iterator iter = m_paramsWithValue.find(std::string(paramKey));
|
||||
return iter != m_paramsWithValue.end() ? iter->second.c_str() : "";
|
||||
}
|
||||
|
||||
@ -1418,7 +1499,7 @@ void LogFormat::parseFromFormat(const base::type::string_t& userFormat) {
|
||||
if (hasFlag(flag)) {
|
||||
// If we already have flag we remove the escape chars so that '%%' is turned to '%'
|
||||
// even after specifier resolution - this is because we only replaceFirst specifier
|
||||
formatCopy.erase(foundAt > 0 ? foundAt - 1 : 0, 1);
|
||||
formatCopy.erase(foundAt - 1, 1);
|
||||
++foundAt;
|
||||
}
|
||||
} else {
|
||||
@ -1621,10 +1702,11 @@ void TypedConfigurations::build(Configurations* configurations) {
|
||||
} else if (conf->configurationType() == ConfigurationType::PerformanceTracking) {
|
||||
setValue(Level::Global, getBool(conf->value()), &m_performanceTrackingMap);
|
||||
} else if (conf->configurationType() == ConfigurationType::MaxLogFileSize) {
|
||||
setValue(conf->level(), static_cast<std::size_t>(getULong(conf->value())), &m_maxLogFileSizeMap);
|
||||
#if !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
auto v = getULong(conf->value());
|
||||
setValue(conf->level(), static_cast<std::size_t>(v), &m_maxLogFileSizeMap);
|
||||
if (v != 0) {
|
||||
withFileSizeLimit.push_back(conf);
|
||||
#endif // !defined(ELPP_NO_DEFAULT_LOG_FILE)
|
||||
}
|
||||
} else if (conf->configurationType() == ConfigurationType::LogFlushThreshold) {
|
||||
setValue(conf->level(), static_cast<std::size_t>(getULong(conf->value())), &m_logFlushThresholdMap);
|
||||
}
|
||||
@ -1698,12 +1780,6 @@ std::string TypedConfigurations::resolveFilename(const std::string& filename) {
|
||||
}
|
||||
|
||||
void TypedConfigurations::insertFile(Level level, const std::string& fullFilename) {
|
||||
#if defined(ELPP_NO_LOG_TO_FILE)
|
||||
setValue(level, false, &m_toFileMap);
|
||||
ELPP_UNUSED(fullFilename);
|
||||
m_fileStreamMap.insert(std::make_pair(level, base::FileStreamPtr(nullptr)));
|
||||
return;
|
||||
#endif
|
||||
std::string resolvedFilename = resolveFilename(fullFilename);
|
||||
if (resolvedFilename.empty()) {
|
||||
std::cerr << "Could not load empty file for logging, please re-check your configurations for level ["
|
||||
@ -1839,8 +1915,10 @@ bool RegisteredLoggers::remove(const std::string& id) {
|
||||
if (id == base::consts::kDefaultLoggerId) {
|
||||
return false;
|
||||
}
|
||||
// get has internal lock
|
||||
Logger* logger = base::utils::Registry<Logger, std::string>::get(id);
|
||||
if (logger != nullptr) {
|
||||
// unregister has internal lock
|
||||
unregister(logger);
|
||||
}
|
||||
return true;
|
||||
@ -1948,7 +2026,7 @@ bool VRegistry::allowed(base::type::VerboseLevel vlevel, const char* file) {
|
||||
} else {
|
||||
char baseFilename[base::consts::kSourceFilenameMaxLength] = "";
|
||||
base::utils::File::buildBaseFilename(file, baseFilename);
|
||||
std::map<std::string, base::type::VerboseLevel>::iterator it = m_modules.begin();
|
||||
std::unordered_map<std::string, base::type::VerboseLevel>::iterator it = m_modules.begin();
|
||||
for (; it != m_modules.end(); ++it) {
|
||||
if (base::utils::Str::wildCardMatch(baseFilename, it->first.c_str())) {
|
||||
return vlevel <= it->second;
|
||||
@ -1989,20 +2067,26 @@ Storage::Storage(const LogBuilderPtr& defaultLogBuilder) :
|
||||
m_registeredLoggers(new base::RegisteredLoggers(defaultLogBuilder)),
|
||||
m_flags(ELPP_DEFAULT_LOGGING_FLAGS),
|
||||
m_vRegistry(new base::VRegistry(0, &m_flags)),
|
||||
|
||||
#if ELPP_ASYNC_LOGGING
|
||||
m_asyncLogQueue(new base::AsyncLogQueue()),
|
||||
m_asyncDispatchWorker(asyncDispatchWorker),
|
||||
#endif // ELPP_ASYNC_LOGGING
|
||||
|
||||
m_preRollOutCallback(base::defaultPreRollOutCallback) {
|
||||
// Register default logger
|
||||
m_registeredLoggers->get(std::string(base::consts::kDefaultLoggerId));
|
||||
// We register default logger anyway (worse case it's not going to register) just in case
|
||||
m_registeredLoggers->get("default");
|
||||
|
||||
#if defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||
// Register performance logger and reconfigure format
|
||||
Logger* performanceLogger = m_registeredLoggers->get(std::string(base::consts::kPerformanceLoggerId));
|
||||
m_registeredLoggers->get("performance");
|
||||
performanceLogger->configurations()->setGlobally(ConfigurationType::Format, std::string("%datetime %level %msg"));
|
||||
performanceLogger->reconfigure();
|
||||
#endif // defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||
|
||||
#if defined(ELPP_SYSLOG)
|
||||
// Register syslog logger and reconfigure format
|
||||
Logger* sysLogLogger = m_registeredLoggers->get(std::string(base::consts::kSysLogLoggerId));
|
||||
@ -2045,7 +2129,7 @@ Storage::~Storage(void) {
|
||||
}
|
||||
|
||||
bool Storage::hasCustomFormatSpecifier(const char* formatSpecifier) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
base::threading::ScopedLock scopedLock(customFormatSpecifiersLock());
|
||||
return std::find(m_customFormatSpecifiers.begin(), m_customFormatSpecifiers.end(),
|
||||
formatSpecifier) != m_customFormatSpecifiers.end();
|
||||
}
|
||||
@ -2054,12 +2138,12 @@ void Storage::installCustomFormatSpecifier(const CustomFormatSpecifier& customFo
|
||||
if (hasCustomFormatSpecifier(customFormatSpecifier.formatSpecifier())) {
|
||||
return;
|
||||
}
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
base::threading::ScopedLock scopedLock(customFormatSpecifiersLock());
|
||||
m_customFormatSpecifiers.push_back(customFormatSpecifier);
|
||||
}
|
||||
|
||||
bool Storage::uninstallCustomFormatSpecifier(const char* formatSpecifier) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
base::threading::ScopedLock scopedLock(customFormatSpecifiersLock());
|
||||
std::vector<CustomFormatSpecifier>::iterator it = std::find(m_customFormatSpecifiers.begin(),
|
||||
m_customFormatSpecifiers.end(), formatSpecifier);
|
||||
if (it != m_customFormatSpecifiers.end() && strcmp(formatSpecifier, it->formatSpecifier()) == 0) {
|
||||
@ -2097,9 +2181,33 @@ void Storage::setApplicationArguments(int argc, char** argv) {
|
||||
#endif // defined(ELPP_LOGGING_FLAGS_FROM_ARG)
|
||||
}
|
||||
|
||||
} // namespace base
|
||||
|
||||
// LogDispatchCallback
|
||||
void LogDispatchCallback::handle(const LogDispatchData* data) {
|
||||
#if defined(ELPP_THREAD_SAFE)
|
||||
base::threading::ScopedLock scopedLock(m_fileLocksMapLock);
|
||||
std::string filename = data->logMessage()->logger()->typedConfigurations()->filename(data->logMessage()->level());
|
||||
auto lock = m_fileLocks.find(filename);
|
||||
if (lock == m_fileLocks.end()) {
|
||||
m_fileLocks.emplace(std::make_pair(filename, std::unique_ptr<base::threading::Mutex>(new base::threading::Mutex)));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
base::threading::Mutex& LogDispatchCallback::fileHandle(const LogDispatchData* data) {
|
||||
auto it = m_fileLocks.find(data->logMessage()->logger()->typedConfigurations()->filename(data->logMessage()->level()));
|
||||
return *(it->second.get());
|
||||
}
|
||||
|
||||
namespace base {
|
||||
// DefaultLogDispatchCallback
|
||||
|
||||
void DefaultLogDispatchCallback::handle(const LogDispatchData* data) {
|
||||
#if defined(ELPP_THREAD_SAFE)
|
||||
LogDispatchCallback::handle(data);
|
||||
base::threading::ScopedLock scopedLock(fileHandle(data));
|
||||
#endif
|
||||
m_data = data;
|
||||
dispatch(m_data->logMessage()->logger()->logBuilder()->build(m_data->logMessage(),
|
||||
m_data->dispatchAction() == base::DispatchAction::NormalLog));
|
||||
@ -2348,6 +2456,8 @@ base::type::string_t DefaultLogBuilder::build(const LogMessage* logMessage, bool
|
||||
base::utils::Str::replaceFirstWithEscape(logLine, base::consts::kMessageFormatSpecifier, logMessage->message());
|
||||
}
|
||||
#if !defined(ELPP_DISABLE_CUSTOM_FORMAT_SPECIFIERS)
|
||||
el::base::threading::ScopedLock lock_(ELPP->customFormatSpecifiersLock());
|
||||
ELPP_UNUSED(lock_);
|
||||
for (std::vector<CustomFormatSpecifier>::const_iterator it = ELPP->customFormatSpecifiers()->begin();
|
||||
it != ELPP->customFormatSpecifiers()->end(); ++it) {
|
||||
std::string fs(it->formatSpecifier());
|
||||
@ -2368,10 +2478,15 @@ void LogDispatcher::dispatch(void) {
|
||||
if (!m_proceed) {
|
||||
return;
|
||||
}
|
||||
#ifndef ELPP_NO_GLOBAL_LOCK
|
||||
// see https://github.com/muflihun/easyloggingpp/issues/580
|
||||
// global lock is turned off by default unless
|
||||
// ELPP_NO_GLOBAL_LOCK is defined
|
||||
base::threading::ScopedLock scopedLock(ELPP->lock());
|
||||
base::TypedConfigurations* tc = m_logMessage.logger()->m_typedConfigurations;
|
||||
#endif
|
||||
base::TypedConfigurations* tc = m_logMessage->logger()->m_typedConfigurations;
|
||||
if (ELPP->hasFlag(LoggingFlag::StrictLogFileSizeCheck)) {
|
||||
tc->validateFileRolling(m_logMessage.level(), ELPP->preRollOutCallback());
|
||||
tc->validateFileRolling(m_logMessage->level(), ELPP->preRollOutCallback());
|
||||
}
|
||||
LogDispatchCallback* callback = nullptr;
|
||||
LogDispatchData data;
|
||||
@ -2379,7 +2494,7 @@ void LogDispatcher::dispatch(void) {
|
||||
: ELPP->m_logDispatchCallbacks) {
|
||||
callback = h.second.get();
|
||||
if (callback != nullptr && callback->enabled()) {
|
||||
data.setLogMessage(&m_logMessage);
|
||||
data.setLogMessage(m_logMessage);
|
||||
data.setDispatchAction(m_dispatchAction);
|
||||
callback->handle(&data);
|
||||
}
|
||||
@ -2426,6 +2541,7 @@ Writer& Writer::construct(int count, const char* loggerIds, ...) {
|
||||
va_list loggersList;
|
||||
va_start(loggersList, loggerIds);
|
||||
const char* id = loggerIds;
|
||||
m_loggerIds.reserve(count);
|
||||
for (int i = 0; i < count; ++i) {
|
||||
m_loggerIds.push_back(std::string(id));
|
||||
id = va_arg(loggersList, const char*);
|
||||
@ -2444,12 +2560,12 @@ void Writer::initializeLogger(const std::string& loggerId, bool lookup, bool nee
|
||||
m_logger = ELPP->registeredLoggers()->get(loggerId, ELPP->hasFlag(LoggingFlag::CreateLoggerAutomatically));
|
||||
}
|
||||
if (m_logger == nullptr) {
|
||||
ELPP->acquireLock();
|
||||
{
|
||||
if (!ELPP->registeredLoggers()->has(std::string(base::consts::kDefaultLoggerId))) {
|
||||
// Somehow default logger has been unregistered. Not good! Register again
|
||||
ELPP->registeredLoggers()->get(std::string(base::consts::kDefaultLoggerId));
|
||||
}
|
||||
ELPP->releaseLock(); // Need to unlock it for next writer
|
||||
}
|
||||
Writer(Level::Debug, m_file, m_line, m_func).construct(1, base::consts::kDefaultLoggerId)
|
||||
<< "Logger [" << loggerId << "] is not registered yet!";
|
||||
m_proceed = false;
|
||||
@ -2510,8 +2626,13 @@ void Writer::processDispatch() {
|
||||
|
||||
void Writer::triggerDispatch(void) {
|
||||
if (m_proceed) {
|
||||
base::LogDispatcher(m_proceed, LogMessage(m_level, m_file, m_line, m_func, m_verboseLevel,
|
||||
m_logger), m_dispatchAction).dispatch();
|
||||
if (m_msg == nullptr) {
|
||||
LogMessage msg(m_level, m_file, m_line, m_func, m_verboseLevel,
|
||||
m_logger);
|
||||
base::LogDispatcher(m_proceed, &msg, m_dispatchAction).dispatch();
|
||||
} else {
|
||||
base::LogDispatcher(m_proceed, m_msg, m_dispatchAction).dispatch();
|
||||
}
|
||||
}
|
||||
if (m_logger != nullptr) {
|
||||
m_logger->stream().str(ELPP_LITERAL(""));
|
||||
@ -2524,7 +2645,7 @@ void Writer::triggerDispatch(void) {
|
||||
std::stringstream reasonStream;
|
||||
reasonStream << "Fatal log at [" << m_file << ":" << m_line << "]"
|
||||
<< " If you wish to disable 'abort on fatal log' please use "
|
||||
<< "el::Helpers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog)";
|
||||
<< "el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog)";
|
||||
base::utils::abort(1, reasonStream.str());
|
||||
}
|
||||
m_proceed = false;
|
||||
@ -2640,18 +2761,19 @@ namespace debug {
|
||||
|
||||
// StackTrace
|
||||
|
||||
StackTrace::StackTraceEntry::StackTraceEntry(std::size_t index, const char* loc, const char* demang, const char* hex,
|
||||
const char* addr) {
|
||||
m_index = index;
|
||||
m_location = std::string(loc);
|
||||
m_demangled = std::string(demang);
|
||||
m_hex = std::string(hex);
|
||||
m_addr = std::string(addr);
|
||||
StackTrace::StackTraceEntry::StackTraceEntry(std::size_t index, const std::string& loc, const std::string& demang,
|
||||
const std::string& hex,
|
||||
const std::string& addr) :
|
||||
m_index(index),
|
||||
m_location(loc),
|
||||
m_demangled(demang),
|
||||
m_hex(hex),
|
||||
m_addr(addr) {
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& ss, const StackTrace::StackTraceEntry& si) {
|
||||
ss << "[" << si.m_index << "] " << si.m_location << (si.m_demangled.empty() ? "" : ":") << si.m_demangled
|
||||
<< (si.m_hex.empty() ? "" : "+") << si.m_hex << si.m_addr;
|
||||
ss << "[" << si.m_index << "] " << si.m_location << (si.m_hex.empty() ? "" : "+") << si.m_hex << " " << si.m_addr <<
|
||||
(si.m_demangled.empty() ? "" : ":") << si.m_demangled;
|
||||
return ss;
|
||||
}
|
||||
|
||||
@ -2671,44 +2793,40 @@ void StackTrace::generateNew(void) {
|
||||
char** strings = backtrace_symbols(stack, size);
|
||||
if (size > kStackStart) { // Skip StackTrace c'tor and generateNew
|
||||
for (std::size_t i = kStackStart; i < size; ++i) {
|
||||
char* mangName = nullptr;
|
||||
char* hex = nullptr;
|
||||
char* addr = nullptr;
|
||||
for (char* c = strings[i]; *c; ++c) {
|
||||
switch (*c) {
|
||||
case '(':
|
||||
mangName = c;
|
||||
break;
|
||||
case '+':
|
||||
hex = c;
|
||||
break;
|
||||
case ')':
|
||||
addr = c;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
std::string mangName;
|
||||
std::string location;
|
||||
std::string hex;
|
||||
std::string addr;
|
||||
|
||||
// entry: 2 crash.cpp.bin 0x0000000101552be5 _ZN2el4base5debug10StackTraceC1Ev + 21
|
||||
const std::string line(strings[i]);
|
||||
auto p = line.find("_");
|
||||
if (p != std::string::npos) {
|
||||
mangName = line.substr(p);
|
||||
mangName = mangName.substr(0, mangName.find(" +"));
|
||||
}
|
||||
p = line.find("0x");
|
||||
if (p != std::string::npos) {
|
||||
addr = line.substr(p);
|
||||
addr = addr.substr(0, addr.find("_"));
|
||||
}
|
||||
// Perform demangling if parsed properly
|
||||
if (mangName != nullptr && hex != nullptr && addr != nullptr && mangName < hex) {
|
||||
*mangName++ = '\0';
|
||||
*hex++ = '\0';
|
||||
*addr++ = '\0';
|
||||
if (!mangName.empty()) {
|
||||
int status = 0;
|
||||
char* demangName = abi::__cxa_demangle(mangName, 0, 0, &status);
|
||||
char* demangName = abi::__cxa_demangle(mangName.data(), 0, 0, &status);
|
||||
// if demangling is successful, output the demangled function name
|
||||
if (status == 0) {
|
||||
// Success (see http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3/a01696.html)
|
||||
StackTraceEntry entry(i - 1, strings[i], demangName, hex, addr);
|
||||
StackTraceEntry entry(i - 1, location, demangName, hex, addr);
|
||||
m_stack.push_back(entry);
|
||||
} else {
|
||||
// Not successful - we will use mangled name
|
||||
StackTraceEntry entry(i - 1, strings[i], mangName, hex, addr);
|
||||
StackTraceEntry entry(i - 1, location, mangName, hex, addr);
|
||||
m_stack.push_back(entry);
|
||||
}
|
||||
free(demangName);
|
||||
} else {
|
||||
StackTraceEntry entry(i - 1, strings[i]);
|
||||
StackTraceEntry entry(i - 1, line);
|
||||
m_stack.push_back(entry);
|
||||
}
|
||||
}
|
||||
@ -2742,6 +2860,9 @@ static std::string crashReason(int sig) {
|
||||
}
|
||||
/// @brief Logs reason of crash from sig
|
||||
static void logCrashReason(int sig, bool stackTraceIfAvailable, Level level, const char* logger) {
|
||||
if (sig == SIGINT && ELPP->hasFlag(el::LoggingFlag::IgnoreSigInt)) {
|
||||
return;
|
||||
}
|
||||
std::stringstream ss;
|
||||
ss << "CRASH HANDLED; ";
|
||||
ss << crashReason(sig);
|
||||
@ -2820,7 +2941,6 @@ void Helpers::logCrashReason(int sig, bool stackTraceIfAvailable, Level level, c
|
||||
// Loggers
|
||||
|
||||
Logger* Loggers::getLogger(const std::string& identity, bool registerIfNotAvailable) {
|
||||
base::threading::ScopedLock scopedLock(ELPP->lock());
|
||||
return ELPP->registeredLoggers()->get(identity, registerIfNotAvailable);
|
||||
}
|
||||
|
||||
@ -2829,12 +2949,10 @@ void Loggers::setDefaultLogBuilder(el::LogBuilderPtr& logBuilderPtr) {
|
||||
}
|
||||
|
||||
bool Loggers::unregisterLogger(const std::string& identity) {
|
||||
base::threading::ScopedLock scopedLock(ELPP->lock());
|
||||
return ELPP->registeredLoggers()->remove(identity);
|
||||
}
|
||||
|
||||
bool Loggers::hasLogger(const std::string& identity) {
|
||||
base::threading::ScopedLock scopedLock(ELPP->lock());
|
||||
return ELPP->registeredLoggers()->has(identity);
|
||||
}
|
||||
|
||||
@ -2984,11 +3102,11 @@ void Loggers::clearVModules(void) {
|
||||
// VersionInfo
|
||||
|
||||
const std::string VersionInfo::version(void) {
|
||||
return std::string("9.95.0");
|
||||
return std::string("9.96.7");
|
||||
}
|
||||
/// @brief Release date of current version
|
||||
const std::string VersionInfo::releaseDate(void) {
|
||||
return std::string("02-08-2017 2312hrs");
|
||||
return std::string("24-11-2018 0728hrs");
|
||||
}
|
||||
|
||||
} // namespace el
|
||||
|
||||
280
vendor/github.com/muflihun/easyloggingpp/src/easylogging++.h
generated
vendored
280
vendor/github.com/muflihun/easyloggingpp/src/easylogging++.h
generated
vendored
@ -1,18 +1,19 @@
|
||||
//
|
||||
// Bismillah ar-Rahmaan ar-Raheem
|
||||
//
|
||||
// Easylogging++ v9.95.0
|
||||
// Easylogging++ v9.96.7
|
||||
// Single-header only, cross-platform logging library for C++ applications
|
||||
//
|
||||
// Copyright (c) 2017 muflihun.com
|
||||
// Copyright (c) 2012-2018 Zuhd Web Services
|
||||
// Copyright (c) 2012-2018 @abumusamq
|
||||
//
|
||||
// This library is released under the MIT Licence.
|
||||
// http://labs.muflihun.com/easyloggingpp/licence.php
|
||||
// https://github.com/zuhd-org/easyloggingpp/blob/master/LICENSE
|
||||
//
|
||||
// https://github.com/muflihun/easyloggingpp
|
||||
// https://muflihun.github.io/easyloggingpp
|
||||
// https://zuhd.org
|
||||
// http://muflihun.com
|
||||
//
|
||||
|
||||
#ifndef EASYLOGGINGPP_H
|
||||
#define EASYLOGGINGPP_H
|
||||
// Compilers and C++0x/C++11 Evaluation
|
||||
@ -93,7 +94,7 @@
|
||||
#else
|
||||
# define ELPP_OS_MAC 0
|
||||
#endif
|
||||
#if (defined(__FreeBSD__))
|
||||
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
|
||||
# define ELPP_OS_FREEBSD 1
|
||||
#else
|
||||
# define ELPP_OS_FREEBSD 0
|
||||
@ -103,13 +104,23 @@
|
||||
#else
|
||||
# define ELPP_OS_SOLARIS 0
|
||||
#endif
|
||||
#if (defined(_AIX))
|
||||
# define ELPP_OS_AIX 1
|
||||
#else
|
||||
# define ELPP_OS_AIX 0
|
||||
#endif
|
||||
#if (defined(__NetBSD__))
|
||||
# define ELPP_OS_NETBSD 1
|
||||
#else
|
||||
# define ELPP_OS_NETBSD 0
|
||||
#endif
|
||||
#if defined(__EMSCRIPTEN__)
|
||||
# define ELPP_OS_EMSCRIPTEN 1
|
||||
#else
|
||||
# define ELPP_OS_EMSCRIPTEN 0
|
||||
#endif
|
||||
// Unix
|
||||
#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_NETBSD || ELPP_OS_SOLARIS) && (!ELPP_OS_WINDOWS))
|
||||
#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_NETBSD || ELPP_OS_SOLARIS || ELPP_OS_AIX || ELPP_OS_EMSCRIPTEN) && (!ELPP_OS_WINDOWS))
|
||||
# define ELPP_OS_UNIX 1
|
||||
#else
|
||||
# define ELPP_OS_UNIX 0
|
||||
@ -194,7 +205,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
|
||||
# define ELPP_INTERNAL_INFO(lvl, msg)
|
||||
#endif // (defined(ELPP_DEBUG_INFO))
|
||||
#if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
|
||||
# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_ANDROID)
|
||||
# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
|
||||
# define ELPP_STACKTRACE 1
|
||||
# else
|
||||
# if ELPP_COMPILER_MSVC
|
||||
@ -373,6 +384,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
#include <functional>
|
||||
#include <algorithm>
|
||||
@ -410,9 +422,6 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
|
||||
# if defined(ELPP_LOG_STD_ARRAY)
|
||||
# include <array>
|
||||
# endif // defined(ELPP_LOG_STD_ARRAY)
|
||||
# if defined(ELPP_LOG_UNORDERED_MAP)
|
||||
# include <unordered_map>
|
||||
# endif // defined(ELPP_LOG_UNORDERED_MAP)
|
||||
# if defined(ELPP_LOG_UNORDERED_SET)
|
||||
# include <unordered_set>
|
||||
# endif // defined(ELPP_UNORDERED_SET)
|
||||
@ -580,6 +589,16 @@ enum class Level : base::type::EnumType {
|
||||
/// @brief Represents unknown level
|
||||
Unknown = 1010
|
||||
};
|
||||
} // namespace el
|
||||
namespace std {
|
||||
template<> struct hash<el::Level> {
|
||||
public:
|
||||
std::size_t operator()(const el::Level& l) const {
|
||||
return hash<el::base::type::EnumType> {}(static_cast<el::base::type::EnumType>(l));
|
||||
}
|
||||
};
|
||||
}
|
||||
namespace el {
|
||||
/// @brief Static class that contains helper functions for el::Level
|
||||
class LevelHelper : base::StaticClass {
|
||||
public:
|
||||
@ -702,115 +721,43 @@ enum class LoggingFlag : base::type::EnumType {
|
||||
/// @brief Adds spaces b/w logs that separated by left-shift operator
|
||||
AutoSpacing = 8192,
|
||||
/// @brief Preserves time format and does not convert it to sec, hour etc (performance tracking only)
|
||||
FixedTimeFormat = 16384
|
||||
FixedTimeFormat = 16384,
|
||||
// @brief Ignore SIGINT or crash
|
||||
IgnoreSigInt = 32768,
|
||||
};
|
||||
namespace base {
|
||||
/// @brief Namespace containing constants used internally.
|
||||
namespace consts {
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
#endif
|
||||
// Level log values - These are values that are replaced in place of %level format specifier
|
||||
// Extra spaces after format specifiers are only for readability purposes in log files
|
||||
static const base::type::char_t* kInfoLevelLogValue = ELPP_LITERAL("INFO");
|
||||
static const base::type::char_t* kDebugLevelLogValue = ELPP_LITERAL("DEBUG");
|
||||
static const base::type::char_t* kWarningLevelLogValue = ELPP_LITERAL("WARNING");
|
||||
static const base::type::char_t* kErrorLevelLogValue = ELPP_LITERAL("ERROR");
|
||||
static const base::type::char_t* kFatalLevelLogValue = ELPP_LITERAL("FATAL");
|
||||
static const base::type::char_t* kVerboseLevelLogValue =
|
||||
ELPP_LITERAL("VERBOSE"); // will become VERBOSE-x where x = verbose level
|
||||
static const base::type::char_t* kTraceLevelLogValue = ELPP_LITERAL("TRACE");
|
||||
static const base::type::char_t* kInfoLevelShortLogValue = ELPP_LITERAL("I");
|
||||
static const base::type::char_t* kDebugLevelShortLogValue = ELPP_LITERAL("D");
|
||||
static const base::type::char_t* kWarningLevelShortLogValue = ELPP_LITERAL("W");
|
||||
static const base::type::char_t* kErrorLevelShortLogValue = ELPP_LITERAL("E");
|
||||
static const base::type::char_t* kFatalLevelShortLogValue = ELPP_LITERAL("F");
|
||||
static const base::type::char_t* kVerboseLevelShortLogValue = ELPP_LITERAL("V");
|
||||
static const base::type::char_t* kTraceLevelShortLogValue = ELPP_LITERAL("T");
|
||||
// Format specifiers - These are used to define log format
|
||||
static const base::type::char_t* kAppNameFormatSpecifier = ELPP_LITERAL("%app");
|
||||
static const base::type::char_t* kLoggerIdFormatSpecifier = ELPP_LITERAL("%logger");
|
||||
static const base::type::char_t* kThreadIdFormatSpecifier = ELPP_LITERAL("%thread");
|
||||
static const base::type::char_t* kSeverityLevelFormatSpecifier = ELPP_LITERAL("%level");
|
||||
static const base::type::char_t* kSeverityLevelShortFormatSpecifier = ELPP_LITERAL("%levshort");
|
||||
static const base::type::char_t* kDateTimeFormatSpecifier = ELPP_LITERAL("%datetime");
|
||||
static const base::type::char_t* kLogFileFormatSpecifier = ELPP_LITERAL("%file");
|
||||
static const base::type::char_t* kLogFileBaseFormatSpecifier = ELPP_LITERAL("%fbase");
|
||||
static const base::type::char_t* kLogLineFormatSpecifier = ELPP_LITERAL("%line");
|
||||
static const base::type::char_t* kLogLocationFormatSpecifier = ELPP_LITERAL("%loc");
|
||||
static const base::type::char_t* kLogFunctionFormatSpecifier = ELPP_LITERAL("%func");
|
||||
static const base::type::char_t* kCurrentUserFormatSpecifier = ELPP_LITERAL("%user");
|
||||
static const base::type::char_t* kCurrentHostFormatSpecifier = ELPP_LITERAL("%host");
|
||||
static const base::type::char_t* kMessageFormatSpecifier = ELPP_LITERAL("%msg");
|
||||
static const base::type::char_t* kVerboseLevelFormatSpecifier = ELPP_LITERAL("%vlevel");
|
||||
static const char* kDateTimeFormatSpecifierForFilename = "%datetime";
|
||||
// Date/time
|
||||
static const char* kDays[7] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
|
||||
static const char* kDaysAbbrev[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
||||
static const char* kMonths[12] = { "January", "February", "March", "Apri", "May", "June", "July", "August",
|
||||
"September", "October", "November", "December"
|
||||
};
|
||||
static const char* kMonthsAbbrev[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
|
||||
static const char* kDefaultDateTimeFormat = "%Y-%M-%d %H:%m:%s,%g";
|
||||
static const char* kDefaultDateTimeFormatInFilename = "%Y-%M-%d_%H-%m";
|
||||
static const int kYearBase = 1900;
|
||||
static const char* kAm = "AM";
|
||||
static const char* kPm = "PM";
|
||||
// Miscellaneous constants
|
||||
static const char kFormatSpecifierCharValue = 'v';
|
||||
static const char kFormatSpecifierChar = '%';
|
||||
static const unsigned int kMaxLogPerCounter = 100000;
|
||||
static const unsigned int kMaxLogPerContainer = 100;
|
||||
static const unsigned int kDefaultSubsecondPrecision = 3;
|
||||
|
||||
#ifdef ELPP_DEFAULT_LOGGER
|
||||
static const char* kDefaultLoggerId = ELPP_DEFAULT_LOGGER;
|
||||
#else
|
||||
static const char* kDefaultLoggerId = "default";
|
||||
#endif
|
||||
|
||||
#if defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||
#ifdef ELPP_DEFAULT_PERFORMANCE_LOGGER
|
||||
static const char* kPerformanceLoggerId = ELPP_DEFAULT_PERFORMANCE_LOGGER;
|
||||
#else
|
||||
static const char* kPerformanceLoggerId = "performance";
|
||||
#endif // ELPP_DEFAULT_PERFORMANCE_LOGGER
|
||||
#endif
|
||||
|
||||
#if defined(ELPP_SYSLOG)
|
||||
static const char* kSysLogLoggerId = "syslog";
|
||||
#endif // defined(ELPP_SYSLOG)
|
||||
static const char* kNullPointer = "nullptr";
|
||||
static const char kFormatSpecifierChar = '%';
|
||||
#if ELPP_VARIADIC_TEMPLATES_SUPPORTED
|
||||
static const char kFormatSpecifierCharValue = 'v';
|
||||
#endif // ELPP_VARIADIC_TEMPLATES_SUPPORTED
|
||||
static const unsigned int kMaxLogPerContainer = 100;
|
||||
static const unsigned int kMaxLogPerCounter = 100000;
|
||||
static const unsigned int kDefaultSubsecondPrecision = 3;
|
||||
static const base::type::VerboseLevel kMaxVerboseLevel = 9;
|
||||
static const char* kUnknownUser = "user";
|
||||
static const char* kUnknownHost = "unknown-host";
|
||||
#if defined(ELPP_DEFAULT_LOG_FILE)
|
||||
static const char* kDefaultLogFile = ELPP_DEFAULT_LOG_FILE;
|
||||
#else
|
||||
# if ELPP_OS_UNIX
|
||||
# if ELPP_OS_ANDROID
|
||||
static const char* kDefaultLogFile = "logs/myeasylog.log";
|
||||
# else
|
||||
static const char* kDefaultLogFile = "logs/myeasylog.log";
|
||||
# endif // ELPP_OS_ANDROID
|
||||
# elif ELPP_OS_WINDOWS
|
||||
static const char* kDefaultLogFile = "logs\\myeasylog.log";
|
||||
# endif // ELPP_OS_UNIX
|
||||
#endif // defined(ELPP_DEFAULT_LOG_FILE)
|
||||
#if !defined(ELPP_DISABLE_LOG_FILE_FROM_ARG)
|
||||
static const char* kDefaultLogFileParam = "--default-log-file";
|
||||
#endif // !defined(ELPP_DISABLE_LOG_FILE_FROM_ARG)
|
||||
#if defined(ELPP_LOGGING_FLAGS_FROM_ARG)
|
||||
static const char* kLoggingFlagsParam = "--logging-flags";
|
||||
#endif // defined(ELPP_LOGGING_FLAGS_FROM_ARG)
|
||||
|
||||
#if ELPP_OS_WINDOWS
|
||||
static const char* kFilePathSeperator = "\\";
|
||||
#else
|
||||
static const char* kFilePathSeperator = "/";
|
||||
#endif // ELPP_OS_WINDOWS
|
||||
static const char* kValidLoggerIdSymbols =
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._";
|
||||
static const char* kConfigurationComment = "##";
|
||||
static const char* kConfigurationLevel = "*";
|
||||
static const char* kConfigurationLoggerId = "--";
|
||||
|
||||
static const std::size_t kSourceFilenameMaxLength = 100;
|
||||
static const std::size_t kSourceLineMaxLength = 10;
|
||||
static const Level kPerformanceTrackerDefaultLevel = Level::Info;
|
||||
@ -855,9 +802,6 @@ const struct {
|
||||
},
|
||||
};
|
||||
static const int kCrashSignalsCount = sizeof(kCrashSignals) / sizeof(kCrashSignals[0]);
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
} // namespace consts
|
||||
} // namespace base
|
||||
typedef std::function<void(const char*, std::size_t)> PreRollOutCallback;
|
||||
@ -1257,8 +1201,8 @@ class DateTime : base::StaticClass {
|
||||
base::TimestampUnit timestampUnit);
|
||||
|
||||
|
||||
private:
|
||||
static struct ::tm* buildTimeInfo(struct timeval* currTime, struct ::tm* timeInfo);
|
||||
private:
|
||||
static char* parseFormat(char* buf, std::size_t bufSz, const char* format, const struct tm* tInfo,
|
||||
std::size_t msec, const base::SubsecondPrecision* ssPrec);
|
||||
};
|
||||
@ -1297,7 +1241,7 @@ class CommandLineArgs {
|
||||
private:
|
||||
int m_argc;
|
||||
char** m_argv;
|
||||
std::map<std::string, std::string> m_paramsWithValue;
|
||||
std::unordered_map<std::string, std::string> m_paramsWithValue;
|
||||
std::vector<std::string> m_params;
|
||||
};
|
||||
/// @brief Abstract registry (aka repository) that provides basic interface for pointer repository specified by T_Ptr type.
|
||||
@ -1422,7 +1366,7 @@ class AbstractRegistry : public base::threading::ThreadSafe {
|
||||
/// of AbstractRegistry<T_Ptr, Container>. Any implementation of this class should be
|
||||
/// explicitly (by using lock functions)
|
||||
template <typename T_Ptr, typename T_Key = const char*>
|
||||
class Registry : public AbstractRegistry<T_Ptr, std::map<T_Key, T_Ptr*>> {
|
||||
class Registry : public AbstractRegistry<T_Ptr, std::unordered_map<T_Key, T_Ptr*>> {
|
||||
public:
|
||||
typedef typename Registry<T_Ptr, T_Key>::iterator iterator;
|
||||
typedef typename Registry<T_Ptr, T_Key>::const_iterator const_iterator;
|
||||
@ -1486,7 +1430,7 @@ class Registry : public AbstractRegistry<T_Ptr, std::map<T_Key, T_Ptr*>> {
|
||||
}
|
||||
|
||||
private:
|
||||
virtual void deepCopy(const AbstractRegistry<T_Ptr, std::map<T_Key, T_Ptr*>>& sr) ELPP_FINAL {
|
||||
virtual void deepCopy(const AbstractRegistry<T_Ptr, std::unordered_map<T_Key, T_Ptr*>>& sr) ELPP_FINAL {
|
||||
for (const_iterator it = sr.cbegin(); it != sr.cend(); ++it) {
|
||||
registerNew(it->first, new T_Ptr(*it->second));
|
||||
}
|
||||
@ -1586,7 +1530,7 @@ class RegistryWithPred : public AbstractRegistry<T_Ptr, std::vector<T_Ptr*>> {
|
||||
class Utils {
|
||||
public:
|
||||
template <typename T, typename TPtr>
|
||||
static bool installCallback(const std::string& id, std::map<std::string, TPtr>* mapT) {
|
||||
static bool installCallback(const std::string& id, std::unordered_map<std::string, TPtr>* mapT) {
|
||||
if (mapT->find(id) == mapT->end()) {
|
||||
mapT->insert(std::make_pair(id, TPtr(new T())));
|
||||
return true;
|
||||
@ -1595,15 +1539,15 @@ class Utils {
|
||||
}
|
||||
|
||||
template <typename T, typename TPtr>
|
||||
static void uninstallCallback(const std::string& id, std::map<std::string, TPtr>* mapT) {
|
||||
static void uninstallCallback(const std::string& id, std::unordered_map<std::string, TPtr>* mapT) {
|
||||
if (mapT->find(id) != mapT->end()) {
|
||||
mapT->erase(id);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename TPtr>
|
||||
static T* callback(const std::string& id, std::map<std::string, TPtr>* mapT) {
|
||||
typename std::map<std::string, TPtr>::iterator iter = mapT->find(id);
|
||||
static T* callback(const std::string& id, std::unordered_map<std::string, TPtr>* mapT) {
|
||||
typename std::unordered_map<std::string, TPtr>::iterator iter = mapT->find(id);
|
||||
if (iter != mapT->end()) {
|
||||
return static_cast<T*>(iter->second.get());
|
||||
}
|
||||
@ -1948,7 +1892,7 @@ class Configurations : public base::utils::RegistryWithPred<Configuration, Confi
|
||||
|
||||
namespace base {
|
||||
typedef std::shared_ptr<base::type::fstream_t> FileStreamPtr;
|
||||
typedef std::map<std::string, FileStreamPtr> LogStreamsReferenceMap;
|
||||
typedef std::unordered_map<std::string, FileStreamPtr> LogStreamsReferenceMap;
|
||||
/// @brief Configurations with data types.
|
||||
///
|
||||
/// @detail el::Configurations have string based values. This is whats used internally in order to read correct configurations.
|
||||
@ -1985,16 +1929,16 @@ class TypedConfigurations : public base::threading::ThreadSafe {
|
||||
|
||||
private:
|
||||
Configurations* m_configurations;
|
||||
std::map<Level, bool> m_enabledMap;
|
||||
std::map<Level, bool> m_toFileMap;
|
||||
std::map<Level, std::string> m_filenameMap;
|
||||
std::map<Level, bool> m_toStandardOutputMap;
|
||||
std::map<Level, base::LogFormat> m_logFormatMap;
|
||||
std::map<Level, base::SubsecondPrecision> m_subsecondPrecisionMap;
|
||||
std::map<Level, bool> m_performanceTrackingMap;
|
||||
std::map<Level, base::FileStreamPtr> m_fileStreamMap;
|
||||
std::map<Level, std::size_t> m_maxLogFileSizeMap;
|
||||
std::map<Level, std::size_t> m_logFlushThresholdMap;
|
||||
std::unordered_map<Level, bool> m_enabledMap;
|
||||
std::unordered_map<Level, bool> m_toFileMap;
|
||||
std::unordered_map<Level, std::string> m_filenameMap;
|
||||
std::unordered_map<Level, bool> m_toStandardOutputMap;
|
||||
std::unordered_map<Level, base::LogFormat> m_logFormatMap;
|
||||
std::unordered_map<Level, base::SubsecondPrecision> m_subsecondPrecisionMap;
|
||||
std::unordered_map<Level, bool> m_performanceTrackingMap;
|
||||
std::unordered_map<Level, base::FileStreamPtr> m_fileStreamMap;
|
||||
std::unordered_map<Level, std::size_t> m_maxLogFileSizeMap;
|
||||
std::unordered_map<Level, std::size_t> m_logFlushThresholdMap;
|
||||
base::LogStreamsReferenceMap* m_logStreamsReference;
|
||||
|
||||
friend class el::Helpers;
|
||||
@ -2004,21 +1948,21 @@ class TypedConfigurations : public base::threading::ThreadSafe {
|
||||
friend class el::base::LogDispatcher;
|
||||
|
||||
template <typename Conf_T>
|
||||
inline Conf_T getConfigByVal(Level level, const std::map<Level, Conf_T>* confMap, const char* confName) {
|
||||
inline Conf_T getConfigByVal(Level level, const std::unordered_map<Level, Conf_T>* confMap, const char* confName) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
return unsafeGetConfigByVal(level, confMap, confName); // This is not unsafe anymore - mutex locked in scope
|
||||
}
|
||||
|
||||
template <typename Conf_T>
|
||||
inline Conf_T& getConfigByRef(Level level, std::map<Level, Conf_T>* confMap, const char* confName) {
|
||||
inline Conf_T& getConfigByRef(Level level, std::unordered_map<Level, Conf_T>* confMap, const char* confName) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
return unsafeGetConfigByRef(level, confMap, confName); // This is not unsafe anymore - mutex locked in scope
|
||||
}
|
||||
|
||||
template <typename Conf_T>
|
||||
Conf_T unsafeGetConfigByVal(Level level, const std::map<Level, Conf_T>* confMap, const char* confName) {
|
||||
Conf_T unsafeGetConfigByVal(Level level, const std::unordered_map<Level, Conf_T>* confMap, const char* confName) {
|
||||
ELPP_UNUSED(confName);
|
||||
typename std::map<Level, Conf_T>::const_iterator it = confMap->find(level);
|
||||
typename std::unordered_map<Level, Conf_T>::const_iterator it = confMap->find(level);
|
||||
if (it == confMap->end()) {
|
||||
try {
|
||||
return confMap->at(Level::Global);
|
||||
@ -2033,9 +1977,9 @@ class TypedConfigurations : public base::threading::ThreadSafe {
|
||||
}
|
||||
|
||||
template <typename Conf_T>
|
||||
Conf_T& unsafeGetConfigByRef(Level level, std::map<Level, Conf_T>* confMap, const char* confName) {
|
||||
Conf_T& unsafeGetConfigByRef(Level level, std::unordered_map<Level, Conf_T>* confMap, const char* confName) {
|
||||
ELPP_UNUSED(confName);
|
||||
typename std::map<Level, Conf_T>::iterator it = confMap->find(level);
|
||||
typename std::unordered_map<Level, Conf_T>::iterator it = confMap->find(level);
|
||||
if (it == confMap->end()) {
|
||||
try {
|
||||
return confMap->at(Level::Global);
|
||||
@ -2049,14 +1993,15 @@ class TypedConfigurations : public base::threading::ThreadSafe {
|
||||
}
|
||||
|
||||
template <typename Conf_T>
|
||||
void setValue(Level level, const Conf_T& value, std::map<Level, Conf_T>* confMap, bool includeGlobalLevel = true) {
|
||||
void setValue(Level level, const Conf_T& value, std::unordered_map<Level, Conf_T>* confMap,
|
||||
bool includeGlobalLevel = true) {
|
||||
// If map is empty and we are allowed to add into generic level (Level::Global), do it!
|
||||
if (confMap->empty() && includeGlobalLevel) {
|
||||
confMap->insert(std::make_pair(Level::Global, value));
|
||||
return;
|
||||
}
|
||||
// If same value exist in generic level already, dont add it to explicit level
|
||||
typename std::map<Level, Conf_T>::iterator it = confMap->find(Level::Global);
|
||||
typename std::unordered_map<Level, Conf_T>::iterator it = confMap->find(Level::Global);
|
||||
if (it != confMap->end() && it->second == value) {
|
||||
return;
|
||||
}
|
||||
@ -2218,21 +2163,26 @@ class LogDispatchData {
|
||||
inline base::DispatchAction dispatchAction(void) const {
|
||||
return m_dispatchAction;
|
||||
}
|
||||
private:
|
||||
LogMessage* m_logMessage;
|
||||
base::DispatchAction m_dispatchAction;
|
||||
friend class base::LogDispatcher;
|
||||
|
||||
inline void setLogMessage(LogMessage* logMessage) {
|
||||
m_logMessage = logMessage;
|
||||
}
|
||||
inline void setDispatchAction(base::DispatchAction dispatchAction) {
|
||||
m_dispatchAction = dispatchAction;
|
||||
}
|
||||
private:
|
||||
LogMessage* m_logMessage;
|
||||
base::DispatchAction m_dispatchAction;
|
||||
friend class base::LogDispatcher;
|
||||
|
||||
};
|
||||
class LogDispatchCallback : public Callback<LogDispatchData> {
|
||||
protected:
|
||||
virtual void handle(const LogDispatchData* data);
|
||||
base::threading::Mutex& fileHandle(const LogDispatchData* data);
|
||||
private:
|
||||
friend class base::LogDispatcher;
|
||||
std::unordered_map<std::string, std::unique_ptr<base::threading::Mutex>> m_fileLocks;
|
||||
base::threading::Mutex m_fileLocksMapLock;
|
||||
};
|
||||
class PerformanceTrackingCallback : public Callback<PerformanceTrackingData> {
|
||||
private:
|
||||
@ -2350,7 +2300,7 @@ inline void FUNCTION_NAME(const T&);
|
||||
std::string m_parentApplicationName;
|
||||
bool m_isConfigured;
|
||||
Configurations m_configurations;
|
||||
std::map<Level, unsigned int> m_unflushedCount;
|
||||
std::unordered_map<Level, unsigned int> m_unflushedCount;
|
||||
base::LogStreamsReferenceMap* m_logStreamsReference;
|
||||
LogBuilderPtr m_logBuilder;
|
||||
|
||||
@ -2456,7 +2406,7 @@ class RegisteredLoggers : public base::utils::Registry<Logger, std::string> {
|
||||
LogBuilderPtr m_defaultLogBuilder;
|
||||
Configurations m_defaultConfigurations;
|
||||
base::LogStreamsReferenceMap m_logStreamsReference;
|
||||
std::map<std::string, base::type::LoggerRegistrationCallbackPtr> m_loggerRegistrationCallbacks;
|
||||
std::unordered_map<std::string, base::type::LoggerRegistrationCallbackPtr> m_loggerRegistrationCallbacks;
|
||||
friend class el::base::Storage;
|
||||
|
||||
void unsafeFlushAll(void);
|
||||
@ -2482,7 +2432,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
|
||||
|
||||
bool allowed(base::type::VerboseLevel vlevel, const char* file);
|
||||
|
||||
inline const std::map<std::string, base::type::VerboseLevel>& modules(void) const {
|
||||
inline const std::unordered_map<std::string, base::type::VerboseLevel>& modules(void) const {
|
||||
return m_modules;
|
||||
}
|
||||
|
||||
@ -2496,7 +2446,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
|
||||
private:
|
||||
base::type::VerboseLevel m_level;
|
||||
base::type::EnumType* m_pFlags;
|
||||
std::map<std::string, base::type::VerboseLevel> m_modules;
|
||||
std::unordered_map<std::string, base::type::VerboseLevel> m_modules;
|
||||
};
|
||||
} // namespace base
|
||||
class LogMessage {
|
||||
@ -2680,6 +2630,10 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
|
||||
return &m_customFormatSpecifiers;
|
||||
}
|
||||
|
||||
base::threading::Mutex& customFormatSpecifiersLock() {
|
||||
return m_customFormatSpecifiersLock;
|
||||
}
|
||||
|
||||
inline void setLoggingLevel(Level level) {
|
||||
m_loggingLevel = level;
|
||||
}
|
||||
@ -2720,12 +2674,13 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
|
||||
/// @brief Sets thread name for current thread. Requires std::thread
|
||||
inline void setThreadName(const std::string& name) {
|
||||
if (name.empty()) return;
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
base::threading::ScopedLock scopedLock(m_threadNamesLock);
|
||||
m_threadNames[base::threading::getCurrentThreadId()] = name;
|
||||
}
|
||||
|
||||
inline std::string getThreadName(const std::string& threadId) {
|
||||
std::map<std::string, std::string>::const_iterator it = m_threadNames.find(threadId);
|
||||
base::threading::ScopedLock scopedLock(m_threadNamesLock);
|
||||
std::unordered_map<std::string, std::string>::const_iterator it = m_threadNames.find(threadId);
|
||||
if (it == m_threadNames.end()) {
|
||||
return threadId;
|
||||
}
|
||||
@ -2742,10 +2697,12 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
|
||||
#endif // ELPP_ASYNC_LOGGING
|
||||
base::utils::CommandLineArgs m_commandLineArgs;
|
||||
PreRollOutCallback m_preRollOutCallback;
|
||||
std::map<std::string, base::type::LogDispatchCallbackPtr> m_logDispatchCallbacks;
|
||||
std::map<std::string, base::type::PerformanceTrackingCallbackPtr> m_performanceTrackingCallbacks;
|
||||
std::map<std::string, std::string> m_threadNames;
|
||||
std::unordered_map<std::string, base::type::LogDispatchCallbackPtr> m_logDispatchCallbacks;
|
||||
std::unordered_map<std::string, base::type::PerformanceTrackingCallbackPtr> m_performanceTrackingCallbacks;
|
||||
std::unordered_map<std::string, std::string> m_threadNames;
|
||||
std::vector<CustomFormatSpecifier> m_customFormatSpecifiers;
|
||||
base::threading::Mutex m_customFormatSpecifiersLock;
|
||||
base::threading::Mutex m_threadNamesLock;
|
||||
Level m_loggingLevel;
|
||||
|
||||
friend class el::Helpers;
|
||||
@ -2788,7 +2745,7 @@ class AsyncDispatchWorker : public base::IWorker, public base::threading::Thread
|
||||
void run(void);
|
||||
|
||||
void setContinueRunning(bool value) {
|
||||
base::threading::ScopedLock scopedLock(m_continueRunningMutex);
|
||||
base::threading::ScopedLock scopedLock(m_continueRunningLock);
|
||||
m_continueRunning = value;
|
||||
}
|
||||
|
||||
@ -2798,7 +2755,7 @@ class AsyncDispatchWorker : public base::IWorker, public base::threading::Thread
|
||||
private:
|
||||
std::condition_variable cv;
|
||||
bool m_continueRunning;
|
||||
base::threading::Mutex m_continueRunningMutex;
|
||||
base::threading::Mutex m_continueRunningLock;
|
||||
};
|
||||
#endif // ELPP_ASYNC_LOGGING
|
||||
} // namespace base
|
||||
@ -2810,9 +2767,9 @@ class DefaultLogBuilder : public LogBuilder {
|
||||
/// @brief Dispatches log messages
|
||||
class LogDispatcher : base::NoCopy {
|
||||
public:
|
||||
LogDispatcher(bool proceed, LogMessage&& logMessage, base::DispatchAction dispatchAction) :
|
||||
LogDispatcher(bool proceed, LogMessage* logMessage, base::DispatchAction dispatchAction) :
|
||||
m_proceed(proceed),
|
||||
m_logMessage(std::move(logMessage)),
|
||||
m_logMessage(logMessage),
|
||||
m_dispatchAction(std::move(dispatchAction)) {
|
||||
}
|
||||
|
||||
@ -2820,7 +2777,7 @@ class LogDispatcher : base::NoCopy {
|
||||
|
||||
private:
|
||||
bool m_proceed;
|
||||
LogMessage m_logMessage;
|
||||
LogMessage* m_logMessage;
|
||||
base::DispatchAction m_dispatchAction;
|
||||
};
|
||||
#if defined(ELPP_STL_LOGGING)
|
||||
@ -3233,10 +3190,15 @@ class Writer : base::NoCopy {
|
||||
Writer(Level level, const char* file, base::type::LineNumber line,
|
||||
const char* func, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog,
|
||||
base::type::VerboseLevel verboseLevel = 0) :
|
||||
m_level(level), m_file(file), m_line(line), m_func(func), m_verboseLevel(verboseLevel),
|
||||
m_msg(nullptr), m_level(level), m_file(file), m_line(line), m_func(func), m_verboseLevel(verboseLevel),
|
||||
m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) {
|
||||
}
|
||||
|
||||
Writer(LogMessage* msg, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog) :
|
||||
m_msg(msg), m_level(msg != nullptr ? msg->level() : Level::Unknown),
|
||||
m_line(0), m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) {
|
||||
}
|
||||
|
||||
virtual ~Writer(void) {
|
||||
processDispatch();
|
||||
}
|
||||
@ -3267,6 +3229,7 @@ class Writer : base::NoCopy {
|
||||
Writer& construct(Logger* logger, bool needLock = true);
|
||||
Writer& construct(int count, const char* loggerIds, ...);
|
||||
protected:
|
||||
LogMessage* m_msg;
|
||||
Level m_level;
|
||||
const char* m_file;
|
||||
const base::type::LineNumber m_line;
|
||||
@ -3325,6 +3288,7 @@ void Logger::log_(Level level, int vlevel, const T& log) {
|
||||
base::DispatchAction::NormalLog, vlevel).construct(this, false) << log;
|
||||
} else {
|
||||
stream().str(ELPP_LITERAL(""));
|
||||
releaseLock();
|
||||
}
|
||||
} else {
|
||||
base::Writer(level, "FILE", 0, "FUNCTION").construct(this, false) << log;
|
||||
@ -3332,23 +3296,23 @@ void Logger::log_(Level level, int vlevel, const T& log) {
|
||||
}
|
||||
template <typename T, typename... Args>
|
||||
inline void Logger::log(Level level, const char* s, const T& value, const Args&... args) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
acquireLock(); // released in Writer!
|
||||
log_(level, 0, s, value, args...);
|
||||
}
|
||||
template <typename T>
|
||||
inline void Logger::log(Level level, const T& log) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
acquireLock(); // released in Writer!
|
||||
log_(level, 0, log);
|
||||
}
|
||||
# if ELPP_VERBOSE_LOG
|
||||
template <typename T, typename... Args>
|
||||
inline void Logger::verbose(int vlevel, const char* s, const T& value, const Args&... args) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
acquireLock(); // released in Writer!
|
||||
log_(el::Level::Verbose, vlevel, s, value, args...);
|
||||
}
|
||||
template <typename T>
|
||||
inline void Logger::verbose(int vlevel, const T& log) {
|
||||
base::threading::ScopedLock scopedLock(lock());
|
||||
acquireLock(); // released in Writer!
|
||||
log_(el::Level::Verbose, vlevel, log);
|
||||
}
|
||||
# else
|
||||
@ -3603,8 +3567,9 @@ class StackTrace : base::NoCopy {
|
||||
static const unsigned int kStackStart = 2; // We want to skip c'tor and StackTrace::generateNew()
|
||||
class StackTraceEntry {
|
||||
public:
|
||||
StackTraceEntry(std::size_t index, const char* loc, const char* demang, const char* hex, const char* addr);
|
||||
StackTraceEntry(std::size_t index, char* loc) :
|
||||
StackTraceEntry(std::size_t index, const std::string& loc, const std::string& demang, const std::string& hex,
|
||||
const std::string& addr);
|
||||
StackTraceEntry(std::size_t index, const std::string& loc) :
|
||||
m_index(index),
|
||||
m_location(loc) {
|
||||
}
|
||||
@ -3789,6 +3754,11 @@ class Helpers : base::StaticClass {
|
||||
static inline const el::base::utils::CommandLineArgs* commandLineArgs(void) {
|
||||
return ELPP->commandLineArgs();
|
||||
}
|
||||
/// @brief Reserve space for custom format specifiers for performance
|
||||
/// @see std::vector::reserve
|
||||
static inline void reserveCustomFormatSpecifiers(std::size_t size) {
|
||||
ELPP->m_customFormatSpecifiers.reserve(size);
|
||||
}
|
||||
/// @brief Installs user defined format specifier and handler
|
||||
static inline void installCustomFormatSpecifier(const CustomFormatSpecifier& customFormatSpecifier) {
|
||||
ELPP->installCustomFormatSpecifier(customFormatSpecifier);
|
||||
@ -3802,7 +3772,7 @@ class Helpers : base::StaticClass {
|
||||
return ELPP->hasCustomFormatSpecifier(formatSpecifier);
|
||||
}
|
||||
static inline void validateFileRolling(Logger* logger, Level level) {
|
||||
if (logger == nullptr) return;
|
||||
if (ELPP == nullptr || logger == nullptr) return;
|
||||
logger->m_typedConfigurations->validateFileRolling(level, ELPP->preRollOutCallback());
|
||||
}
|
||||
};
|
||||
|
||||
9
vendor/github.com/muflihun/easyloggingpp/test/file-utils-test.h
generated
vendored
9
vendor/github.com/muflihun/easyloggingpp/test/file-utils-test.h
generated
vendored
@ -21,11 +21,14 @@ TEST(FileUtilsTest, GetSizeOfFile) {
|
||||
EXPECT_EQ(File::getSizeOfFile(fs), strlen(data));
|
||||
}
|
||||
|
||||
#if !ELPP_OS_EMSCRIPTEN
|
||||
// this doesn't work as expected under emscripten's filesystem emulation
|
||||
TEST(FileUtilsTest, PathExists) {
|
||||
EXPECT_TRUE(File::pathExists(filename));
|
||||
removeFile(filename);
|
||||
EXPECT_FALSE(File::pathExists(filename));
|
||||
}
|
||||
#endif
|
||||
|
||||
TEST(FileUtilsTest, ExtractPathFromFilename) {
|
||||
EXPECT_EQ("/this/is/path/on/unix/", File::extractPathFromFilename("/this/is/path/on/unix/file.txt"));
|
||||
@ -34,11 +37,17 @@ TEST(FileUtilsTest, ExtractPathFromFilename) {
|
||||
|
||||
TEST(FileUtilsTest, CreatePath) {
|
||||
const char* path = "/tmp/my/one/long/path";
|
||||
#if !ELPP_OS_EMSCRIPTEN
|
||||
// it'll be reported as existing in emscripten
|
||||
EXPECT_FALSE(File::pathExists(path));
|
||||
#endif
|
||||
EXPECT_TRUE(File::createPath(path));
|
||||
EXPECT_TRUE(File::pathExists(path));
|
||||
removeFile(path);
|
||||
|
||||
#if !ELPP_OS_EMSCRIPTEN
|
||||
EXPECT_FALSE(File::pathExists(path));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
3
vendor/github.com/muflihun/easyloggingpp/test/os-utils-test.h
generated
vendored
3
vendor/github.com/muflihun/easyloggingpp/test/os-utils-test.h
generated
vendored
@ -3,7 +3,8 @@
|
||||
|
||||
#include "test.h"
|
||||
|
||||
#if ELPP_OS_UNIX
|
||||
#if ELPP_OS_UNIX && !ELPP_OS_EMSCRIPTEN
|
||||
// this doesn't make any sense under emscripten; you can't shell out
|
||||
TEST(OSUtilsTest, GetBashOutput) {
|
||||
const char* bashCommand = "echo 'test'";
|
||||
std::string bashResult = OS::getBashOutput(bashCommand);
|
||||
|
||||
12
vendor/github.com/muflihun/easyloggingpp/test/typed-configurations-test.h
generated
vendored
12
vendor/github.com/muflihun/easyloggingpp/test/typed-configurations-test.h
generated
vendored
@ -101,9 +101,17 @@ TEST(TypedConfigurationsTest, NonExistentFileCreation) {
|
||||
c.set(Level::Error, ConfigurationType::Filename, "/tmp/logs/el.gtest.log");
|
||||
TypedConfigurations tConf(&c, ELPP->registeredLoggers()->logStreamsReference());
|
||||
EXPECT_TRUE(tConf.toFile(Level::Global));
|
||||
EXPECT_FALSE(tConf.toFile(Level::Info));
|
||||
EXPECT_TRUE(tConf.toFile(Level::Error));
|
||||
|
||||
#if ELPP_OS_EMSCRIPTEN == 1
|
||||
// On Emscripten, all files can be created; we actually expect success here
|
||||
EXPECT_TRUE(tConf.toFile(Level::Info));
|
||||
EXPECT_NE(nullptr, tConf.fileStream(Level::Info)); // not nullptr (emulated fs)
|
||||
#else
|
||||
EXPECT_EQ(nullptr, tConf.fileStream(Level::Info)); // nullptr
|
||||
EXPECT_FALSE(tConf.toFile(Level::Info));
|
||||
#endif
|
||||
|
||||
EXPECT_TRUE(tConf.toFile(Level::Error));
|
||||
EXPECT_NE(nullptr, tConf.fileStream(Level::Error)); // Not null
|
||||
}
|
||||
|
||||
|
||||
15
vendor/github.com/muflihun/easyloggingpp/tools/release.sh
generated
vendored
15
vendor/github.com/muflihun/easyloggingpp/tools/release.sh
generated
vendored
@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Bash script that helps with releasing new versions of EasyLogging++
|
||||
# Revision: 1.4
|
||||
# @author mkhan3189
|
||||
# Bash script that helps with releasing new versions of Easylogging++
|
||||
# Revision: 1.5
|
||||
# author @abumusamq
|
||||
#
|
||||
# Usage:
|
||||
# ./release.sh [repo-root] [homepage-repo-root] [curr-version] [new-version] [do-not-ask]
|
||||
@ -69,11 +69,12 @@ if [ "$confirm" = "y" ]; then
|
||||
cp $1/src/easylogging++.h .
|
||||
cp $1/src/easylogging++.cc .
|
||||
cp $1/CHANGELOG.md CHANGELOG.txt
|
||||
cp $1/LICENCE LICENCE.txt
|
||||
zip easyloggingpp_v$NEW_VERSION.zip easylogging++.h easylogging++.cc LICENCE.txt CHANGELOG.txt
|
||||
tar -pczf easyloggingpp_v$NEW_VERSION.tar.gz easylogging++.h easylogging++.cc LICENCE.txt CHANGELOG.txt
|
||||
cp $1/README.md README.txt
|
||||
cp $1/LICENSE LICENSE.txt
|
||||
zip easyloggingpp_v$NEW_VERSION.zip easylogging++.h easylogging++.cc LICENSE.txt CHANGELOG.txt README.txt
|
||||
tar -pczf easyloggingpp_v$NEW_VERSION.tar.gz easylogging++.h easylogging++.cc LICENSE.txt CHANGELOG.txt README.txt
|
||||
mv easyloggingpp_v$NEW_VERSION.zip $2/
|
||||
mv easyloggingpp_v$NEW_VERSION.tar.gz $2/
|
||||
rm easylogging++.h easylogging++.cc CHANGELOG.txt LICENCE.txt
|
||||
rm easylogging++.h easylogging++.cc CHANGELOG.txt LICENSE.txt README.txt
|
||||
echo "\n---------- PLEASE CHANGE CMakeLists.txt MANUALLY ----------- \n"
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user