From 689ee1620d2cd0f3a9b7cedd3ae958af6834da4e Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Sun, 28 Apr 2024 20:33:27 +0200 Subject: [PATCH 1/8] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 214b1527..782a1c9a 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -63,7 +63,7 @@ jobs: - name: Build - run: cmake --build ${{github.workspace}}/build --target all + run: cmake --build ${{github.workspace}}/build --target all -j16 - name: Test working-directory: ${{github.workspace}}/build From 94777262a8bb7a4b2bc21a447a8a6bdc2f5da2ec Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Sun, 28 Apr 2024 21:23:57 +0200 Subject: [PATCH 2/8] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 782a1c9a..3bcee03f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -8,7 +8,7 @@ on: env: QT_VERSION: '6.6.*' - BUILD_TYPE: 'MinSizeRel' + BUILD_TYPE: 'Release' jobs: build: From 068d72ce04e96e11670dc90f267c165ff64b7523 Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Sun, 28 Apr 2024 21:39:15 +0200 Subject: [PATCH 3/8] Updated README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6f2176d5..2296ab12 100644 --- a/README.md +++ b/README.md @@ -174,8 +174,7 @@ When you parse a file, it will be hashed using the **SHA256** algorithm and the ##### Note -If you don't know, *SHA256* produces an irreversible hash, which means that no information about the file can be retrieved from the hash.
-You have full control on the hashes database (same as for the logs-data database): you can move, delete, view or edit it the way you want (but you must keep the original file-name).
+The *SHA256* algorithm produces an irreversible hash, which means that no information about the file can be retrieved from the hash.
LogDoctor will **never** grab and/or use any information about you or the usage you make of it.
@@ -190,7 +189,7 @@ It can be the default system folder or any folder you decide to use, just set it #### Logs format Before to start parsing logs, you must set-up the *log format* that LogDoctor will have to use.
-Head to the **configurations** section, tap `Logs`, select the **Web Server** you want to configure and tap `Format`.
+Head to the **configurations** section, under `Logs` select the **Web Server** you want to configure and tap `Format`.
Once inside the **Format** section, you can insert the *log format string* you're using. Don't forget to use the `Generete preview` button to generate a *log line sample* and **check the correctness** of the format!
For reliability reasons, LogDoctor **does not** support the usage of the **Carriage Return** inside the log format string. @@ -384,7 +383,7 @@ A new backup is made every time you quit LogDoctor after doing a job which affec #### Note Only the *logs-data database* will be backed-up, the *hashes database* **won't**.
-This is because it is unlikely (supposedly impossible) that a hash equals another, therefore they're supposed to be useful for a short period of time (that is, since you or your web server delete the original log files). +This is because it is unlikely (supposedly impossible) that a hash equals another, therefore they're supposed to be useful for a short period of time (that is, until you or your web server delete the original log files).
@@ -392,7 +391,7 @@ This is because it is unlikely (supposedly impossible) that a hash equals anothe 10~200 MB/s -May be higher or lower depending on the complexity of the logs, the complexity of the blacklist, the build type, your hardware and the workload of your system during the execution. +Take this estimation with a grain of salt, it may be even higher or lower depending on a variety of factors, like: the build type, your hardware, the complexity of the logs, the complexity of the blacklist, the workload of your system during the execution...

From 802e12af311438a9cb5ad83bc18cae5c1f4fcde5 Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Mon, 6 May 2024 23:22:48 +0200 Subject: [PATCH 4/8] Update cmake.yml --- .github/workflows/cmake.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3bcee03f..5a7328a0 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -27,7 +27,8 @@ jobs: uses: actions/checkout@v3 - - name: Install Qt6 + - name: Install Qt6 (!OSX) + if: runner.os != 'macos' uses: jurplel/install-qt-action@v3 with: target: 'desktop' @@ -40,6 +41,13 @@ jobs: setup-python: 'false' + - name: Install Qt6 (OSX) + if: runner.os == 'macos' + run: | + brew update + brew install qt + + - name: Get MSVC (WIN) if: runner.os == 'Windows' uses: ilammy/msvc-dev-cmd@v1.12.1 From e92fc63424187bf89a5c3c194bb4d45412e6a8ee Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Tue, 7 May 2024 20:09:14 +0200 Subject: [PATCH 5/8] Update cmake.yml --- .github/workflows/cmake.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5a7328a0..17bf66d1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -28,7 +28,6 @@ jobs: - name: Install Qt6 (!OSX) - if: runner.os != 'macos' uses: jurplel/install-qt-action@v3 with: target: 'desktop' @@ -38,14 +37,14 @@ jobs: archives: 'icu qtbase qttools qttranslations' tools: 'tools_ifw tools_cmake tools_qtcreator,qt.tools.qtcreator' install-deps: 'true' - setup-python: 'false' + setup-python: 'true' - - name: Install Qt6 (OSX) - if: runner.os == 'macos' - run: | - brew update - brew install qt +# - name: Install Qt6 (OSX) +# if: runner.os == 'macos' +# run: | +# brew update +# brew install qt - name: Get MSVC (WIN) From d84e070c14e36e1b965609ade4a87b66c3380ad0 Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Tue, 7 May 2024 20:21:32 +0200 Subject: [PATCH 6/8] Update cmake.yml --- .github/workflows/cmake.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 17bf66d1..b5a750ce 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -24,10 +24,10 @@ jobs: steps: - name: Get LogDoctor - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Install Qt6 (!OSX) + - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: target: 'desktop' @@ -37,19 +37,11 @@ jobs: archives: 'icu qtbase qttools qttranslations' tools: 'tools_ifw tools_cmake tools_qtcreator,qt.tools.qtcreator' install-deps: 'true' - setup-python: 'true' - - -# - name: Install Qt6 (OSX) -# if: runner.os == 'macos' -# run: | -# brew update -# brew install qt - name: Get MSVC (WIN) if: runner.os == 'Windows' - uses: ilammy/msvc-dev-cmd@v1.12.1 + uses: ilammy/msvc-dev-cmd@v1.13.0 - name: Append PATHs (WIN) From efe49b684be1656675ff723490fc3243a764ba7c Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Mon, 13 May 2024 19:44:06 +0200 Subject: [PATCH 7/8] Update cmake.yml --- .github/workflows/cmake.yml | 38 ++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b5a750ce..665fa7e4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -3,12 +3,16 @@ name: CMake Build on: pull_request: branches: [ "main" ] -# push: -# branches: [ "main" ] +# release: +# types: [published] env: QT_VERSION: '6.6.*' BUILD_TYPE: 'Release' + SRC_DIR: "${{github.workspace}}/logdoctor" + BUILD_DIR: "${{github.workspace}}/build" + RELEASE_DIR: "${{github.workspace}}/release" +# TAG: ${{ github.event.release.tag_name }} jobs: build: @@ -18,9 +22,9 @@ jobs: fail-fast: false matrix: config: - - { os: ubuntu-latest, arch: gcc_64 } - - { os: windows-latest, arch: win64_msvc2019_64 } - - { os: macos-latest, arch: clang_64 } + - { os: ubuntu-latest, arch: gcc_64, exec: LogDoctor } + - { os: windows-latest, arch: win64_msvc2019_64, exec: LogDoctor.exe } + - { os: macos-latest, arch: clang_64, exec: LogDoctor.app } steps: - name: Get LogDoctor @@ -54,17 +58,33 @@ jobs: - name: Configure CMake (NIX) if: runner.os != 'Windows' - run: cmake -S ${{github.workspace}}/logdoctor -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -S ${{env.SRC_DIR}} -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Configure CMake (WIN) if: runner.os == 'Windows' - run: cmake -S ${{github.workspace}}\logdoctor -B ${{github.workspace}}\build "-DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}}" "-DCMAKE_GENERATOR:STRING=NMake Makefiles JOM" "-DCMAKE_MAKE_PROGRAM:STRING=jom" "-DCMAKE_CXX_COMPILER=cl.exe" + run: cmake -S ${{env.SRC_DIR}} -B ${{env.BUILD_DIR}} "-DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}}" "-DCMAKE_GENERATOR:STRING=NMake Makefiles JOM" "-DCMAKE_MAKE_PROGRAM:STRING=jom" "-DCMAKE_CXX_COMPILER=cl.exe" - name: Build - run: cmake --build ${{github.workspace}}/build --target all -j16 + run: cmake --build ${{env.BUILD_DIR}} --target all -j16 - name: Test - working-directory: ${{github.workspace}}/build + working-directory: ${{env.BUILD_DIR}} run: ctest + - name: Prepare deployment + run: | + mkdir "${{env.RELEASE_DIR}}" + mv "${{env.BUILD_DIR}}/${{matrix.config.exec}}" "${{env.RELEASE_DIR}}/" +# echo "RELEASE_NAME=LogDoctor-${TAG:1}-amd64_${{matrix.config.osname}}" >> $GITHUB_ENV + + - name: Deploy + uses: actions/upload-artifact@v4 + with: +# name: ${{env.RELEASE_NAME}} + name: 'LogDoctor_${{matrix.config.os}}' + path: ${{env.RELEASE_DIR}} + if-no-files-found: error + compression-level: 9 + retention-days: 7 + From e46c05bb53fa3bf8f90e5081838c19e2154c277d Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Tue, 14 May 2024 23:00:00 +0200 Subject: [PATCH 8/8] Updated README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2296ab12..85e98844 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

LogDoctor

Parse Apache2 / Nginx / IIS logs and view dynamically generated statistics


- +
@@ -120,7 +120,6 @@ See [HOW_TO_COMPILE.md](https://github.com/elB4RTO/LogDoctor/blob/main/HOW_TO_CO ### Version check -A version check utility is available while running LogDoctor to check the availability of a new version.
To check for updates, open the menu `Utilities`→`Version check`.

### How to update @@ -131,8 +130,8 @@ See [HOW_TO_UPDATE.md](https://github.com/elB4RTO/LogDoctor/blob/main/HOW_TO_UPD ## Before to start -When you run LogDoctor for the first time, please take a minute to set-up the things it needs.
-Head to the **configurations** section and give a look at least at the [logs format](#logs-format) settings. You have to tell the doctor what he'll be dealing with! +When you run LogDoctor for the first time, you will most likely see an empty list of log files.
+Head to the **configurations** section and give a look at least at the [logs format](#logs-format) settings. Only files containings logs that match the given format will be shown in the list.

@@ -188,7 +187,7 @@ It can be the default system folder or any folder you decide to use, just set it #### Logs format -Before to start parsing logs, you must set-up the *log format* that LogDoctor will have to use.
+Before to start parsing logs, you must set-up the *loga format*.
Head to the **configurations** section, under `Logs` select the **Web Server** you want to configure and tap `Format`.
Once inside the **Format** section, you can insert the *log format string* you're using. Don't forget to use the `Generete preview` button to generate a *log line sample* and **check the correctness** of the format!