Skip to content

Commit

Permalink
bump version 0.6.72
Browse files Browse the repository at this point in the history
  • Loading branch information
jtmoon79 committed May 28, 2024
1 parent a8a89bd commit a64be8e
Show file tree
Hide file tree
Showing 14 changed files with 40,236 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ categories = [
"filesystem",
]
readme = "README.md"
version = "0.6.71"
version = "0.6.72"
edition = "2021"
# `rust-version` (MSRV) should match ./github/workflows/rust.yml:rust_msrv:msrv and ./README.md
rust-version = "1.70.0"
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ Speedily search and merge log messages by datetime.
* Must update parameters `branch=` and `version=` per release; replace the version
-->

[![MSRV](https://img.shields.io/crates/msrv/super_speedy_syslog_searcher/0.6.71?logo=rust&logoColor=800000&cacheSeconds=6000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/0.6.71/Cargo.toml#L15)
[![MSRV](https://img.shields.io/crates/msrv/super_speedy_syslog_searcher/0.6.72?logo=rust&logoColor=800000&cacheSeconds=6000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/0.6.72/Cargo.toml#L15)
[![License](https://img.shields.io/crates/l/super-speedy-syslog-searcher?style=flat-square)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/main/LICENSE.txt)
[![docs.rs](https://img.shields.io/docsrs/super_speedy_syslog_searcher/0.6.71?badge.svg&style=flat-square&logo=docsdotrs)](https://docs.rs/super_speedy_syslog_searcher/0.6.71/)
[![docs.rs](https://img.shields.io/docsrs/super_speedy_syslog_searcher/0.6.72?badge.svg&style=flat-square&logo=docsdotrs)](https://docs.rs/super_speedy_syslog_searcher/0.6.72/)

[![crates.io version](https://img.shields.io/crates/v/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000?branch=0.6.71&version=0.6.71)](https://crates.io/crates/super-speedy-syslog-searcher/0.6.71)
[![crates.io version](https://img.shields.io/crates/v/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000?branch=0.6.72&version=0.6.72)](https://crates.io/crates/super-speedy-syslog-searcher/0.6.72)
[![crates.io downloads](https://img.shields.io/crates/d/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher#:~:text=Downloads%20all%20time)
[![crates.io downloads (version)](https://img.shields.io/crates/dv/super_speedy_syslog_searcher/0.6.71?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher/0.6.71)
[![crates.io downloads (version)](https://img.shields.io/crates/dv/super_speedy_syslog_searcher/0.6.72?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher/0.6.72)
[![lib.rs](https://img.shields.io/badge/lib.rs-white?style=flat-square&logo=rust&logoColor=202020)](https://lib.rs/crates/super_speedy_syslog_searcher/)

[![Build status](https://img.shields.io/github/actions/workflow/status/jtmoon79/super-speedy-syslog-searcher/rust.yml?branch=0.6.71&style=flat-square&logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/actions?query=workflow%3Arust)
[![coveralls.io](https://img.shields.io/coverallsCoverage/github/jtmoon79/super-speedy-syslog-searcher?style=flat-square&logo=coveralls&logoColor=b94947&branch=0.6.71&version=0.6.71)](https://coveralls.io/github/jtmoon79/super-speedy-syslog-searcher?branch=0.6.71)
[![Commits since](https://img.shields.io/github.ghproxy.topmits-since/jtmoon79/super-speedy-syslog-searcher/0.6.71.svg?logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/commits/main)
[![Build status](https://img.shields.io/github/actions/workflow/status/jtmoon79/super-speedy-syslog-searcher/rust.yml?branch=0.6.72&style=flat-square&logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/actions?query=workflow%3Arust)
[![coveralls.io](https://img.shields.io/coverallsCoverage/github/jtmoon79/super-speedy-syslog-searcher?style=flat-square&logo=coveralls&logoColor=b94947&branch=0.6.72&version=0.6.72)](https://coveralls.io/github/jtmoon79/super-speedy-syslog-searcher?branch=0.6.72)
[![Commits since](https://img.shields.io/github.ghproxy.topmits-since/jtmoon79/super-speedy-syslog-searcher/0.6.72.svg?logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/commits/main)

_Super Speedy Syslog Searcher_ (`s4`) is a command-line tool to search
and merge varying log messages from varying log files, sorted by datetime.
Expand Down Expand Up @@ -615,14 +615,14 @@ A comparison of merging three large log files:
This informal runtime comparison used GNU `time` running on Ubuntu 22 on WSL2.

- `grep` 3.7, `sort` 8.32
- `s4` 0.6.71
- `s4` 0.6.72
- `logmerger` 0.9.0 on Python 3.10.12
- `tl` 1.5.0 on Python 3.10.12

See directory [compare-log-mergers] and results in [`compare-log-mergers.txt`].

[compare-log-mergers]: ./tools/compare-log-mergers/
[`compare-log-mergers.txt`]: ./releases/0.6.71/compare-log-mergers.txt
[`compare-log-mergers.txt`]: ./releases/0.6.72/compare-log-mergers.txt

---

Expand Down
60 changes: 60 additions & 0 deletions releases/0.6.72/compare-log-mergers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
$ ./tools/compare-log-mergers/compare-log-mergers.sh
+ git log -n1 --oneline -1
a8a89bd (HEAD -> main) compare-log-mergers.sh note git commit
+ /usr/bin/time --version
time (GNU Time) UNKNOWN
+ python --version
Python 3.10.12
+ python -m pip install --upgrade --force --quiet logmerger==0.9.0
ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
toolong 1.5.0 requires textual<0.59.0,>=0.58.0, but you have textual 0.63.4 which is incompatible.
+ python -m pip install --upgrade --force --quiet toolong==1.5.0
+ python -m pip install --upgrade --force --quiet logdissect==3.1.1
----------------------------------------
+ /usr/bin/grep --version
grep (GNU grep) 3.7
+ /usr/bin/sort --version
sort (GNU coreutils) 8.32

+ /usr/bin/time -p -- bash -c '/usr/bin/grep -hEe '\''^2000-01-01T00\:([234][[:digit:]]\:[[:digit:]]{2}|50\:00)'\'' -- ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log | /usr/bin/sort -t '\'' '\'' -k 1 -s > '\''/tmp/compare-log-mergers_FsHCG.out'\'''
real 0.04
user 0.03
sys 0.00

4403 /tmp/compare-log-mergers_FsHCG.out
----------------------------------------
+ ./target/release/s4 --version
super_speedy_syslog_searcher 0.6.71

+ /usr/bin/time -p -- ./target/release/s4 -a 2000-01-01T00:20:00 -b 2000-01-01T00:50:00 --color=never ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 0.04
user 0.04
sys 0.02

4403 /tmp/compare-log-mergers_FsHCG.out
----------------------------------------
+ logmerger --version
logmerger 0.9.0

+ /usr/bin/time -p -- logmerger --inline --output=- --start 2000-01-01T00:20:00 --end 2000-01-01T00:50:00 ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 0.78
user 0.76
sys 0.01

4908 /tmp/compare-log-mergers_FsHCG.out
----------------------------------------
+ logdissect --version
logdissect 3.1.1

TODO: figure out how to use logdissect. I'm unable to get it to match on ANY files.

----------------------------------------
+ tl --version
tl, version 1.5.0

+ /usr/bin/time -p -- tl --merge --output-merge /tmp/compare-log-mergers_FsHCG.out ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 1.69
user 0.72
sys 0.01

10003 /tmp/compare-log-mergers_FsHCG.out
Loading

0 comments on commit a64be8e

Please sign in to comment.