fix: refactoring

* fix: s3 port type mismatch, add string_or_number_to_string deserializer

* chore: docker-compose.databases.yml

* fix: tests and refactoring, add justfile instead of makefile

* fix: databases.json

* fix: add gbak in production Dockerfile

---------

Co-authored-by: charlesgauthereau <charles.gauthereau@soluce-technologies.com>

.github/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@soluce-technologies.com.
+contact@portabase.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/SECURITY.md

@@ -18,7 +18,7 @@ We take security seriously and aim to support the following versions of the proj
 If you discover a security vulnerability in this project, we appreciate your help in disclosing it responsibly.
 
 1. **Contact Us**  
-   Please report the vulnerability by emailing **[contact@soluce-technologies.com](mailto:contact@soluce-technologies.com)**. Include the following details:
+   Please report the vulnerability by emailing **[contact@portabase.io](mailto:contact@portabase.io)**. Include the following details:
     - A detailed description of the issue.
     - Steps to reproduce the vulnerability (if applicable).
     - Any potential impacts or risks.

.github/workflows/codecov.yml

@@ -2,36 +2,89 @@ name: Codecov Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
+  CARGO_TARGET_DIR: /app/target
+  CARGO_INCREMENTAL: 0
+  RUSTFLAGS: "-C instrument-coverage -C link-dead-code"
+  LLVM_PROFILE_FILE: "/app/coverage/cargo-test-%p-%m.profraw"
 
 jobs:
-  build:
+  coverage:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-      - name: Build
-        run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose
-        env:
-          CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-      - name: rust-grcov
-        uses: actions-rs/grcov@v0.1
-      - name: Codecov
+      - uses: actions/checkout@v4
+
+      - name: Build test image
+        run: docker compose -f docker-compose.test.yml build agent-test
+
+      - name: Start agent-test container
+        run: docker compose -f docker-compose.test.yml up -d agent-test
+
+      - name: Run tests inside container
+        run: |
+          docker compose -f docker-compose.test.yml exec -T \
+            -e CARGO_TARGET_DIR \
+            -e CARGO_INCREMENTAL \
+            -e RUSTFLAGS \
+            -e LLVM_PROFILE_FILE \
+            agent-test bash -c "
+              mkdir -p /app/coverage &&
+              rm -rf /app/target/* /app/coverage/* &&
+              cargo test --verbose &&
+              sync
+            "
+
+      - name: Verify profraw files exist
+        run: |
+          docker compose -f docker-compose.test.yml exec -T \
+            agent-test bash -c '
+              count=$(find /app/coverage -type f -name "*.profraw" | wc -l)
+              echo "profraw files: $count"
+              test "$count" -gt 0
+            '
+
+      - name: Generate coverage report inside container
+        run: |
+          docker compose -f docker-compose.test.yml exec -T \
+            agent-test bash -c "
+              rustup component add llvm-tools-preview &&
+              grcov /app/coverage \
+                --binary-path /app/target/debug \
+                -s /app \
+                --llvm \
+                -t lcov \
+                --branch \
+                --ignore-not-existing \
+                --ignore '/app/target/*' \
+                -o /app/lcov.info
+            "
+
+      - name: Copy lcov.info from container to host
+        run: docker compose -f docker-compose.test.yml cp agent-test:/app/lcov.info ./lcov.info
+
+      - name: Show basic coverage report info
+        run: |
+          echo "lcov.info size:" $(wc -c ./lcov.info | awk '{print $1}')
+          head -n 30 ./lcov.info || true
+          test -s ./lcov.info
+
+      - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}
         with:
+          files: ./lcov.info
+          flags: unittests
+          name: rust-unit-coverage
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          use_pypi: true
+
+      - name: Stop and remove container
+        if: always()
+        run: docker compose -f docker-compose.test.yml down --volumes

.gitignore

@@ -3,4 +3,7 @@
 /src/data/
 
 .DS_Store
-.env
+.env
+
+.claude
+/docs

CITATION.cff

@@ -27,5 +27,5 @@ keywords:
   - self-hosted
   - portabase
 license: Apache-2.0
-version: 1.4.1
+version: 1.11.1
 date-released: '2026-02-24'

Cargo.lock

@@ -82,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anyhow"
@@ -169,6 +169,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568"
+dependencies = [
+ "bytes",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -275,9 +288,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.125.0"
+version = "1.126.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "223f5c95650d9557925a91f4c2db3def189e8f659452134a29e5cd2d37d708ed"
+checksum = "7878050a2321d215eec9db8be09f8db59418b53860ae86cc7042b4094d6cb2bb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -496,7 +509,7 @@ dependencies = [
  "pin-project-lite",
  "rustls 0.21.12",
  "rustls 0.23.37",
- "rustls-native-certs",
+ "rustls-native-certs 0.8.3",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.4",
@@ -744,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "bollard"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227aa051deec8d16bd9c34605e7aaf153f240e35483dd42f6f78903847934738"
+checksum = "ee04c4c84f1f811b017f2fbb7dd8815c976e7ca98593de9c1e2afad0f636bff4"
 dependencies = [
  "async-stream",
  "base64 0.22.1",
@@ -770,7 +783,7 @@ dependencies = [
  "pin-project-lite",
  "rand 0.9.2",
  "rustls 0.23.37",
- "rustls-native-certs",
+ "rustls-native-certs 0.8.3",
  "rustls-pki-types",
  "serde",
  "serde_derive",
@@ -869,9 +882,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -968,6 +981,12 @@ version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
 
+[[package]]
+name = "connection-string"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3"
+
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -1199,9 +1218,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1209,11 +1228,10 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
@@ -1223,9 +1241,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
  "quote",
@@ -1289,9 +1307,9 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
+checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1437,6 +1455,26 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "enumflags2"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+dependencies = [
+ "enumflags2_derive",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1957,9 +1995,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hybrid-array"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b229d73f5803b562cc26e4da0396c8610a4ee209f4fac8fa4f8d709166dc45"
+checksum = "8655f91cd07f2b9d0c24137bd650fe69617773435ee5ec83022377777ce65ef1"
 dependencies = [
  "typenum",
 ]
@@ -2051,7 +2089,7 @@ dependencies = [
  "hyper 1.8.1",
  "hyper-util",
  "rustls 0.23.37",
- "rustls-native-certs",
+ "rustls-native-certs 0.8.3",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.4",
@@ -2821,9 +2859,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 dependencies = [
  "critical-section",
  "portable-atomic",
@@ -2831,9 +2869,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
 dependencies = [
  "bitflags 2.11.0",
  "cfg-if",
@@ -2855,6 +2893,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
 [[package]]
 name = "openssl-probe"
 version = "0.2.1"
@@ -2863,9 +2907,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
 dependencies = [
  "cc",
  "libc",
@@ -3039,7 +3083,7 @@ dependencies = [
 
 [[package]]
 name = "portabase-agent"
-version = "1.4.1"
+version = "1.11.1"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -3077,6 +3121,7 @@ dependencies = [
  "testcontainers",
  "testcontainers-modules",
  "thiserror 2.0.18",
+ "tiberius",
  "time",
  "tokio",
  "tokio-postgres",
@@ -3088,6 +3133,7 @@ dependencies = [
  "tracing-appender",
  "tracing-subscriber",
  "typenum",
+ "url",
  "uuid",
  "wiremock",
 ]
@@ -3191,6 +3237,12 @@ dependencies = [
  "termtree",
 ]
 
+[[package]]
+name = "pretty-hex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -3264,9 +3316,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
  "aws-lc-rs",
  "bytes",
@@ -3677,16 +3729,37 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe 0.1.6",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework 2.11.1",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
- "openssl-probe",
+ "openssl-probe 0.2.1",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 3.7.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -3711,10 +3784,10 @@ dependencies = [
  "log",
  "once_cell",
  "rustls 0.23.37",
- "rustls-native-certs",
+ "rustls-native-certs 0.8.3",
  "rustls-platform-verifier-android",
  "rustls-webpki 0.103.9",
- "security-framework",
+ "security-framework 3.7.0",
  "security-framework-sys",
  "webpki-root-certs",
  "windows-sys 0.61.2",
@@ -3771,9 +3844,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -3832,6 +3905,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.11.0",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
 [[package]]
 name = "security-framework"
 version = "3.7.0"
@@ -3960,9 +4046,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381b283ce7bc6b476d903296fb59d0d36633652b633b27f64db4fb46dcbfc3b9"
+checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -3979,9 +4065,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d4e30573c8cb306ed6ab1dca8423eec9a463ea0e155f45399455e0368b27e0"
+checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -4247,9 +4333,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.26.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
  "getrandom 0.4.2",
@@ -4353,6 +4439,34 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "tiberius"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1446cb4198848d1562301a3340424b4f425ef79f35ef9ee034769a9dd92c10d"
+dependencies = [
+ "async-trait",
+ "asynchronous-codec",
+ "byteorder",
+ "bytes",
+ "chrono",
+ "connection-string",
+ "encoding_rs",
+ "enumflags2",
+ "futures-util",
+ "num-traits",
+ "once_cell",
+ "pin-project-lite",
+ "pretty-hex",
+ "rustls-native-certs 0.6.3",
+ "rustls-pemfile",
+ "thiserror 1.0.69",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "tracing",
+ "uuid",
+]
+
 [[package]]
 name = "time"
 version = "0.3.47"
@@ -4407,9 +4521,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4668,6 +4782,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -4719,9 +4834,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "chrono",
  "matchers",
@@ -5735,18 +5850,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.40"
+version = "0.8.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5"
+checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.40"
+version = "0.8.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953"
+checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "portabase-agent"
-version = "1.4.1"
+version = "1.11.1"
 edition = "2024"
 
 [dependencies]
@@ -30,12 +30,13 @@ tokio-postgres = "0.7.15"
 futures = "0.3.31"
 tracing-appender = "0.2.4"
 time = { version = "0.3.44", features = ["macros"] }
-mongodb = "3.5.0"
+mongodb = "3.5.1"
 rand = "0.9.2"
 bytes = "1.11.0"
 async-stream = "0.3.6"
 uuid = { version = "1.20.0", features = ["v4"] }
-tokio-util = "0.7.18"
+tokio-util = { version = "0.7.18", features = ["compat"] }
+tiberius = { version = "0.12", default-features = false, features = ["rustls", "chrono"] }
 aws-config = "1.8.13"
 aws-sdk-s3 = { version = "1.122.0", features = ["behavior-version-latest"] }
 async-compression = { version = "0.4.37", features = ["tokio", "gzip"] }
@@ -49,15 +50,21 @@ tokio-stream = "0.1.18"
 aes = "0.9.0-rc.4"
 typenum = "1.19.0"
 testcontainers = "0.27.1"
-testcontainers-modules = { version = "0.15.0", features = ["postgres"] }
+testcontainers-modules = { version = "0.15.0", features = ["postgres", "redis", "valkey", "mysql", "mariadb", "mongo"] }
 postgres = "0.19.12"
+url = "2.5.8"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["full"] }
 mockall = "0.13"
 testcontainers = "0.27.1"
+testcontainers-modules = { version = "0.15.0", features = ["postgres", "redis", "mysql", "mariadb", "mongo"] }
 wiremock = "0.6"
 
+[profile.release]
+lto = true
+codegen-units = 1
+strip = "debuginfo"
 
 [[bin]]
 name = "app"

Makefile

@@ -1,54 +0,0 @@
-include .env
-export $(shell sed 's/=.*//' .env)
-CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
-
-.PHONY: seed-mongo seed-mysql seed-postgres
-
-up:
-	@bash $(CLUSTER_SCRIPT)
-
-seed-mongo:
-	@echo "Seeding MongoDB..."
-	bash ./scripts/mongo/seed-mongo.sh
-
-seed-mongo-auth:
-	@echo "Seeding MongoDB with auth..."
-	bash ./scripts/mongo/seed-mongo.sh auth
-
-seed-mysql:
-	@echo "Seeding MySQL..."
-	mysql -h 127.0.0.1 -P "$$MYSQL_PORT" -u "$$MYSQL_USER" -p"$$MYSQL_PASSWORD" "$$MYSQL_DB" < ./scripts/mysql/seed-mysql.sql
-
-seed-mysql-1gb:
-	@echo "Seeding MySQL..."
-	mysql -h 127.0.0.1 -P "$$MYSQL_PORT" -u "$$MYSQL_USER" -p"$$MYSQL_PASSWORD" "$$MYSQL_DB" < ./scripts/mysql/seed-1gb.sql
-
-
-seed-postgres:
-	@echo "Seeding Postgres..."
-	docker exec -i -e PGPASSWORD=$$PG_PASSWORD $$PG_CONTAINER \
-		psql -U $$PG_USER -d $$PG_DB < ./scripts/postgres/seed.sql
-
-seed-postgres-1gb:
-	@echo "Seeding Postgres..."
-	docker exec -i -e PGPASSWORD=$$PG_PASSWORD $$PG_CONTAINER \
-		psql -U $$PG_USER -d $$PG_DB < ./scripts/postgres/seed-1gb.sql
-
-
-SQLITE_SEED_FILE := $(if $(filter big,$(SEED)),./scripts/sqlite/seed-big.sql,./scripts/sqlite/seed.sql)
-
-seed-sqlite:
-	@echo "Seeding Sqlite..."
-	@echo "Run as root to fix permissions inside the volume"
-	docker exec -u 0 -it db-sqlite sh -c "chmod -R 777 /workspace/data"
-	@echo "Create the database file (if it doesn’t exist)"
-	docker exec -u 0 -it db-sqlite sh -c "touch /workspace/data/app.db"
-	@echo "Seed the database"
-	docker exec -i db-sqlite sh -c "sqlite3 /workspace/data/app.db" < $(SQLITE_SEED_FILE)
-	@echo "Verify"
-	docker exec -it db-sqlite sqlite3 /workspace/data/app.db "SELECT name FROM sqlite_master WHERE type='table';"
-	@echo "Done"
-
-
-
-seed-all: seed-mongo seed-mysql seed-postgres seed-postgres-1gb

README.md

@@ -13,14 +13,20 @@
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
 [![Docker Pulls](https://img.shields.io/docker/pulls/portabase/agent?color=brightgreen)](https://hub.docker.com/r/portabase/agent)
+[![Helm Chart](https://img.shields.io/badge/Helm-Kubernetes-326ce5?logo=helm&logoColor=white)](https://github.com/Portabase/agent/pkgs/container/charts%2Fportabase-agent)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
 [![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
 
 [![PostgreSQL](https://img.shields.io/badge/PostgreSQL-336791?logo=postgresql&logoColor=white)](https://www.postgresql.org/)
 [![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
 [![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
+[![Redis](https://img.shields.io/badge/Redis-DC382D?style=flat&logo=Redis&logoColor=white)](https://redis.io/)
 [![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
 [![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
+[![Firebird](https://img.shields.io/badge/Firebird-f55b14?style=flat&logo=Firebird&logoColor=white)](https://firebirdsql.org/)
+
+
 [![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
 [![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
 
@@ -48,7 +54,7 @@ You have 4 ways to install Portabase Agent:
 
 - Automated CLI (recommended) - [details](https://portabase.io/docs/agent/setup#cli)
 - Docker Compose setup - [details](https://portabase.io/docs/agent/setup#docker)
-- Kubernetes with Helm (soon)
+- Kubernetes with Helm [details](https://portabase.io/docs/agent/setup#helm)
 - Development setup - [details](https://portabase.io/docs/agent/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**

databases.json

@@ -13,7 +13,7 @@
     {
       "name": "Test database 2 - MariaDB",
       "database": "mariadb",
-      "type": "mysql",
+      "type": "mariadb",
       "username": "mariadb",
       "password": "changeme",
       "port": 3306,
@@ -21,7 +21,7 @@
       "generated_id": "16678124-ff7e-4c97-8c83-0adeff214681"
     },
     {
-      "name": "Test database 4 - MongoDB Auth",
+      "name": "Test database 3 - MongoDB Auth",
       "database": "testdbauth",
       "type": "mongodb",
       "username": "root",
@@ -31,7 +31,7 @@
       "generated_id": "16678145-ff7e-4c97-8c83-0adeff214681"
     },
     {
-      "name": "Test database 5 - MongoDB",
+      "name": "Test database 4 - MongoDB",
       "database": "testdb",
       "type": "mongodb",
       "port": 27017,
@@ -39,16 +39,78 @@
       "generated_id": "16678147-ff7e-4c97-8c83-0adeff214681"
     },
     {
-      "name": "Test database 6 - SQLite DB",
+      "name": "Test database 5 - SQLite DB",
       "type": "sqlite",
       "path": "/sqlite-data/workspace/data/app.db",
       "generated_id": "16678178-ff7e-4c97-8c83-0adeff214681"
     },
     {
-      "name": "Test database 7 - SQLite DB",
+      "name": "Test database 6 - SQLite DB",
       "type": "sqlite",
       "path": "/sqlite-data-2/workspace/data/app.db",
       "generated_id": "16678179-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 7 - Redis",
+      "type": "redis",
+      "port": 6379,
+      "host": "db-redis",
+      "generated_id": "16678166-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 8 - Redis Auth",
+      "type": "redis",
+      "password": "supersecurepassword",
+      "port": 6379,
+      "username": "default",
+      "host": "db-redis-auth",
+      "generated_id": "16678160-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 9 - Valkey",
+      "type": "valkey",
+      "port": 6379,
+      "host": "db-valkey",
+      "generated_id": "16678560-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 10 - Valkey Auth",
+      "type": "valkey",
+      "password": "supersecurepassword",
+      "port": 6379,
+      "username": "default",
+      "host": "db-valkey-auth",
+      "generated_id": "16678561-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 11 - Mysql",
+      "database": "mysqldb",
+      "type": "mysql",
+      "username": "mysqldb",
+      "password": "changeme",
+      "port": 3306,
+      "host": "db-mysql",
+      "generated_id": "16656124-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 12 - Firebird",
+      "database": "/var/lib/firebird/data/mirror.fdb",
+      "type": "firebird",
+      "username": "alice",
+      "password": "fake_password",
+      "port": 3050,
+      "host": "db-firebird",
+      "generated_id": "16706124-ff7e-4c97-8c83-0adeff214681"
+    },
+    {
+      "name": "Test database 13 - MsSQL",
+      "database": "myappdb",
+      "type": "mssql",
+      "username": "sa",
+      "password": "Portabase!Strong1",
+      "port": 1433,
+      "host": "db-mssql",
+      "generated_id": "16706125-ff7e-4c97-8c83-0adeff214682"
     }
   ]
 }

databases.toml

@@ -29,11 +29,85 @@ host = "db-mongodb-auth"
 generated_id = "16678145-ff7e-4c97-8c83-0adeff214681"
 
 [[databases]]
-name = "Test database 3 - MongoDB"
+name = "Test database 4 - MongoDB"
 database = "testdb"
 type = "mongodb"
-username = ""
-password = ""
 port = 27017
 host = "db-mongodb"
 generated_id = "16678147-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 5 - SQLite DB"
+type = "sqlite"
+path = "/sqlite-data/workspace/data/app.db"
+generated_id = "16678178-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 6 - SQLite DB 2"
+type = "sqlite"
+path = "/sqlite-data-2/workspace/data/app.db"
+generated_id = "16678179-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 7 - Redis"
+type = "redis"
+port = 6379
+host = "db-redis"
+generated_id = "16678166-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 8 - Redis Auth"
+type = "redis"
+password = "supersecurepassword"
+username = "default"
+port = 6379
+host = "db-redis-auth"
+generated_id = "16678160-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 9 - Valkey"
+type = "valkey"
+port = 6379
+host = "db-valkey"
+generated_id = "16678560-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 10 - Valkey Auth"
+type = "valkey"
+password = "supersecurepassword"
+username = "default"
+port = 6379
+host = "db-valkey-auth"
+generated_id = "16678561-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 11 - Mysql"
+database = "mysqldb"
+type = "mysql"
+password = "changeme"
+username = "mysqldb"
+port = 3306
+host = "db-mysql"
+generated_id = "16656124-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 12 - Firebird"
+database = "/var/lib/firebird/data/mirror.fdb"
+type = "firebird"
+password = "fake_password"
+username = "alice"
+port = 3050
+host = "db-firebird"
+generated_id = "16706124-ff7e-4c97-8c83-0adeff214681"
+
+[[databases]]
+name = "Test database 13 - MSSQL"
+database = "myappdb"
+type = "mssql"
+username = "sa"
+password = "Portabase!Strong1"
+port = 1433
+host = "db-mssql"
+generated_id = "16706125-ff7e-4c97-8c83-0adeff214682"
+
+

docker-compose.databases.yml

@@ -0,0 +1,198 @@
+name: databases
+
+services:
+  db-postgres:
+    container_name: db-postgres
+    image: postgres:17-alpine
+    ports:
+      - "5436:5432"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=devdb
+      - POSTGRES_USER=devuser
+      - POSTGRES_PASSWORD=changeme
+    networks:
+      - portabase
+
+  db-mariadb:
+    container_name: db-mariadb
+    image: mariadb:latest
+    ports:
+      - "3311:3306"
+    environment:
+      - MYSQL_DATABASE=mariadb
+      - MYSQL_USER=mariadb
+      - MYSQL_PASSWORD=changeme
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+    volumes:
+      - mariadb-data:/var/lib/mysql
+    networks:
+      - portabase
+
+  db-mysql:
+    container_name: db-mysql
+    image: mysql:9.5
+    ports:
+      - "3312:3306"
+    environment:
+      - MYSQL_DATABASE=mysqldb
+      - MYSQL_USER=mysqldb
+      - MYSQL_PASSWORD=changeme
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+    volumes:
+      - mysql-data:/var/lib/mysql
+    networks:
+      - portabase
+
+
+  db-mongodb-auth:
+    container_name: db-mongodb-auth
+    image: mongo:latest
+    ports:
+      - "27082:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: rootpassword
+      MONGO_INITDB_DATABASE: testdbauth
+    command: mongod --auth
+    networks:
+      - portabase
+    volumes:
+      - mongodb-data-auth:/data/db
+    healthcheck:
+      test: [ "CMD", "mongo", "--eval", "db.adminCommand('ping')" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+  db-mongodb:
+    container_name: db-mongodb
+    image: mongo:latest
+    ports:
+      - "27083:27017"
+    volumes:
+      - mongodb-data:/data/db
+    healthcheck:
+      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    environment:
+      MONGO_INITDB_DATABASE: testdb
+    networks:
+      - portabase
+
+  sqlite:
+    container_name: db-sqlite
+    image: keinos/sqlite3
+    volumes:
+      - sqlite-data:/workspace/data
+    working_dir: /workspace
+    command: tail -f /dev/null
+    stdin_open: true
+    tty: true
+
+  db-redis:
+    image: redis:latest
+    container_name: db-redis
+    ports:
+      - "6378:6379"
+    volumes:
+      - redis-data:/data
+    command: [ "redis-server", "--appendonly", "yes" ]
+    networks:
+      - portabase
+
+  db-redis-auth:
+    image: redis:latest
+    container_name: db-redis-auth
+    ports:
+      - "6380:6379"
+    volumes:
+      - redis-data-auth:/data
+    environment:
+      - REDIS_PASSWORD=supersecurepassword
+    command: [ "redis-server", "--requirepass", "supersecurepassword", "--appendonly", "yes" ]
+    networks:
+      - portabase
+
+  db-valkey:
+    image: valkey/valkey
+    container_name: db-valkey
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    ports:
+      - '6381:6379'
+    volumes:
+      - valkey-data:/data
+    networks:
+      - portabase
+
+  db-valkey-auth:
+    image: valkey/valkey
+    container_name: db-valkey-auth
+    command: >
+      --requirepass "supersecurepassword"
+    ports:
+      - '6382:6379'
+    volumes:
+      - valkey-data-auth:/data
+    networks:
+      - portabase
+
+  db-firebird:
+    image: firebirdsql/firebird
+    container_name: db-firebird
+    restart: always
+    environment:
+      - FIREBIRD_ROOT_PASSWORD=fake_root_password
+      - FIREBIRD_USER=alice
+      - FIREBIRD_PASSWORD=fake_password
+      - FIREBIRD_DATABASE=mirror.fdb
+      - FIREBIRD_DATABASE_DEFAULT_CHARSET=UTF8
+    volumes:
+      - firebird-data:/var/lib/firebird/data
+    ports:
+      - "3060:3050"
+
+    networks:
+      - portabase
+
+  db-mssql:
+    container_name: db-mssql
+    image: mcr.microsoft.com/azure-sql-edge:latest
+    ports:
+      - "1433:1433"
+    environment:
+      ACCEPT_EULA: "Y"
+      MSSQL_SA_PASSWORD: "Portabase!Strong1"
+    volumes:
+      - mssql-data:/var/opt/mssql
+    networks:
+      - portabase
+    healthcheck:
+      test: ["CMD-SHELL", "cat /proc/net/tcp6 | grep -q '059901' || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 20
+
+volumes:
+  postgres-data:
+  mariadb-data:
+  mysql-data:
+  mongodb-data:
+  mongodb-data-auth:
+  sqlite-data:
+  redis-data:
+  redis-data-auth:
+  valkey-data:
+  valkey-data-auth:
+  firebird-data:
+  mssql-data:
+
+networks:
+  portabase:
+    name: portabase_network
+    external: true
+

docker-compose.prod.yml

@@ -5,23 +5,20 @@ services:
 #      dockerfile: docker/Dockerfile
 #      target: prod
     image: portabase/agent:latest
-#    platform: linux/arm64
     container_name: rust-prod
     volumes:
       - ./databases.json:/config/config.json
     environment:
-      #      APP_ENV: production
       LOG: info
       TZ: "Europe/Paris"
-      #      DATABASES_CONFIG_FILE: "config.toml"
-      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOGZmMDE4NTQtYjJhMS00ZTE0LTkwMjctZTJiOWIxZjQ1YzdlIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUE5TWV4M2pmdnVLdFB5YU1ERnh2Ulp2dmd3YkRJQ2JzQi81Wll5NDNSVVRBaXZRYjJiSDdYXG5qRHBQd1lJeCs4UFBrbHlRbDVMQzV1UWZEaCs4SVd4OG1LZ3FvMXpWMkdiZXdGbEdEWFYxVEdyU1ZEU25aSWR4XG52bWdYc29EeXhVMlJvWUFUMS9YMWxuc2YxenZKdkFMTkhXdEhRdk42SjVDZTFSMmFsendVRGFEVXlJNzRmSldQXG5tNTh0SDMrYklXL0VVTXdjaWNxM0oySWw3Vm9KNkZNUHJQL1ZSOWEvdFF1SU1qa200MXpFY2NscExPa2luRkxuXG54NmVUWkFSZUpya2UrbnRvZ2t4TGEyRWV5a1lUNzB4V3hKNWp5ZExBVnRvNkkyQlVLVVJoTkowTUFaU29NYUtvXG5iMGJRcnY1UzExZWllMnMrT2I3aTYzSFpkVUx0UmV1MVJ3SURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
+      #DATABASES_CONFIG_FILE: "config.toml"
+      EDGE_KEY: "<to complete>"
     extra_hosts:
       - "localhost:host-gateway"
     networks:
       - portabase
 
 
-
   db-mongodb-auth:
     container_name: db-mongodb-auth
     image: mongo:latest
@@ -63,7 +60,6 @@ volumes:
   mongodb-data:
   mongodb-data-auth:
 
-
 networks:
   portabase:
     name: portabase_network

docker-compose.test.yml

@@ -0,0 +1,22 @@
+services:
+  agent-test:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      target: dev
+    working_dir: /app
+    container_name: agent-test
+    volumes:
+      - .:/app
+      - cargo-registry:/usr/local/cargo/registry
+      - cargo-git:/usr/local/cargo/git
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      APP_ENV: test
+      LOG: debug
+      TZ: Europe/Paris
+      EDGE_KEY: ""
+
+volumes:
+  cargo-registry:
+  cargo-git:

docker-compose.yml

@@ -7,18 +7,20 @@ services:
     container_name: rust-dev
     volumes:
       - .:/app
-      - ./databases.json:/config/config.json
-      #      - ./databases.toml:/config/config.toml
       - cargo-registry:/usr/local/cargo/registry
       - cargo-git:/usr/local/cargo/git
-      - cargo-target:/app/target
-#      - sqlite-data:/sqlite-data/workspace/data
-#      - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data
+      - ./databases.json:/config/config.json
+      #- ./databases.toml:/config/config.toml
+      #- /var/run/docker.sock:/var/run/docker.sock
+#      - cargo-target:/app/target
+      - databases_sqlite-data:/sqlite-data/workspace/data
+      - ./scripts/sqlite/test-db:/sqlite-data-2/workspace/data
     environment:
       APP_ENV: development
       LOG: debug
       TZ: "Europe/Paris"
-      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOGYwMmExZTAtNDY0NC00MWFmLWIzYjctYjZkYWNjNzQ4OWVhIiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
+      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiMGZiNDYyMmUtMTMxNS00MzMxLTlkMTMtZWMzMjAyZjZiNTIwIiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ=="
+      #CHUNK_SIZE_MB: "1"
       #POOLING: 1
       #DATABASES_CONFIG_FILE: "config.toml"
     extra_hosts:
@@ -26,94 +28,12 @@ services:
     networks:
       - portabase
 
-  db-postgres:
-    container_name: db-postgres
-    image: postgres:17-alpine
-    ports:
-      - "5436:5432"
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_DB=devdb
-      - POSTGRES_USER=devuser
-      - POSTGRES_PASSWORD=changeme
-    networks:
-      - portabase
-#
-#  db-mariadb:
-#    container_name: db-mariadb
-#    image: mariadb:latest
-#    ports:
-#      - "3311:3306"
-#    environment:
-#      - MYSQL_DATABASE=mariadb
-#      - MYSQL_USER=mariadb
-#      - MYSQL_PASSWORD=changeme
-#      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-#    volumes:
-#      - mariadb-data:/var/lib/mysql
-#    networks:
-#      - portabase
-#
-#
-#  db-mongodb-auth:
-#    container_name: db-mongodb-auth
-#    image: mongo:latest
-#    ports:
-#      - "27082:27017"
-#    environment:
-#      MONGO_INITDB_ROOT_USERNAME: root
-#      MONGO_INITDB_ROOT_PASSWORD: rootpassword
-#      MONGO_INITDB_DATABASE: testdbauth
-#    command: mongod --auth
-#    networks:
-#      - portabase
-#    volumes:
-#      - mongodb-data-auth:/data/db
-#    healthcheck:
-#      test: [ "CMD", "mongo", "--eval", "db.adminCommand('ping')" ]
-#      interval: 5s
-#      timeout: 5s
-#      retries: 10
-#
-#  db-mongodb:
-#    container_name: db-mongodb
-#    image: mongo:latest
-#    ports:
-#      - "27083:27017"
-#    volumes:
-#      - mongodb-data:/data/db
-#    healthcheck:
-#      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')" ]
-#      interval: 5s
-#      timeout: 5s
-#      retries: 10
-#    environment:
-#      MONGO_INITDB_DATABASE: testdb
-#    networks:
-#      - portabase
-
-#  sqlite:
-#    container_name: db-sqlite
-#    image: keinos/sqlite3
-#    volumes:
-#      - sqlite-data:/workspace/data
-#    working_dir: /workspace
-#    command: tail -f /dev/null
-#    stdin_open: true
-#    tty: true
-
-
 volumes:
   cargo-registry:
   cargo-git:
-  cargo-target:
-
-  postgres-data:
-#  mariadb-data:
-#  mongodb-data:
-#  mongodb-data-auth:
-#  sqlite-data:
+#  cargo-target:
+  databases_sqlite-data:
+    external: true
 
 networks:
   portabase:

docker/Dockerfile

@@ -1,7 +1,7 @@
 # =========================
 # Base image (shared)
 # =========================
-FROM rust:1.92.0 AS base
+FROM rust:1.94.0 AS base
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     pkg-config \
@@ -16,9 +16,26 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     curl \
     mariadb-client \
     sqlite3 \
+    redis-tools \
+    valkey \
+    firebird3.0-utils \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+ENV DOTNET_ROOT=/usr/local/dotnet
+RUN curl -sSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh \
+    && chmod +x /tmp/dotnet-install.sh \
+    && /tmp/dotnet-install.sh --channel 8.0 --install-dir /usr/local/dotnet \
+    && rm /tmp/dotnet-install.sh \
+    && /usr/local/dotnet/dotnet tool install --global microsoft.sqlpackage
+
+ENV PATH="$PATH:/usr/local/dotnet:/root/.dotnet/tools"
+
+RUN ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
+    && curl -sSL "https://github.com/microsoft/go-sqlcmd/releases/latest/download/sqlcmd-linux-${ARCH}.tar.bz2" \
+       | tar -xjf - -C /usr/local/bin sqlcmd \
+    && chmod +x /usr/local/bin/sqlcmd
+
 ARG TARGETARCH
 
 # =========================
@@ -44,6 +61,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
     rm -rf /tmp/pg-x64 /tmp/pg-arm && \
     chmod +x /usr/lib/postgresql/*/bin/*
 
+
 # =========================
 # MongoDB client binaries
 # =========================
@@ -58,6 +76,7 @@ WORKDIR /app
 FROM base AS dev
 
 RUN cargo install cargo-watch
+RUN cargo install grcov --locked
 
 COPY Cargo.toml Cargo.lock ./
 RUN mkdir src && echo "fn main() {}" > src/main.rs
@@ -92,10 +111,19 @@ RUN apt-get update && apt-get install -y \
     libreadline8 \
     libncurses6 \
     zlib1g \
+    curl \
     mariadb-client \
     sqlite3 \
+    redis-tools \
+    valkey \
+    firebird3.0-utils \
     && rm -rf /var/lib/apt/lists/*
 
+ENV DOTNET_ROOT=/usr/local/dotnet
+RUN curl -sSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh \
+    && chmod +x /tmp/dotnet-install.sh \
+    && /tmp/dotnet-install.sh --channel 8.0 --runtime dotnet --install-dir /usr/local/dotnet \
+    && rm /tmp/dotnet-install.sh
 
 WORKDIR /app
 
@@ -106,8 +134,9 @@ RUN chmod +x /entrypoint.sh
 
 COPY --from=base /usr/lib/postgresql/ /usr/lib/postgresql/
 COPY --from=base /usr/local/mongodb/bin/ /usr/local/mongodb/bin/
+COPY --from=base /root/.dotnet/tools/ /root/.dotnet/tools/
 
-
+ENV PATH="$PATH:/usr/local/dotnet:/root/.dotnet/tools"
 ENV APP_ENV=production
 
 CMD ["/entrypoint.sh"]

docker/entrypoints/app-dev-entrypoint.sh

@@ -34,6 +34,11 @@ check_network() {
 check_docker
 check_network
 
-echo "Starting docker-compose..."
-docker-compose -f ./docker-compose.yml up
-echo "Docker-compose started successfully."
+echo "Stopping old database containers..."
+docker compose -f ./docker-compose.databases.yml down
+
+echo "Starting database containers..."
+docker compose -f ./docker-compose.databases.yml up -d
+
+echo "Starting main services..."
+docker compose -f ./docker-compose.yml up

entrypoint.sh

@@ -34,16 +34,23 @@ if [ -n "$TZ" ]; then
     fi
 fi
 
+REDIS_PORT=65515
 echo "[entrypoint] APP_ENV=$APP_ENV"
 echo "[entrypoint] Starting Redis..."
-redis-server --daemonize yes
+redis-server --port $REDIS_PORT --daemonize yes
 
 echo "[entrypoint] Waiting for Redis to be ready..."
-until redis-cli ping >/dev/null 2>&1; do
+MAX_RETRIES=20
+COUNT=0
+until redis-cli -h localhost -p "$REDIS_PORT" ping >/dev/null 2>&1 ; do
+    COUNT=$((COUNT+1))
+    if [ $COUNT -ge $MAX_RETRIES ]; then
+        echo "[ERROR] Redis did not start after $MAX_RETRIES attempts"
+        exit 1
+    fi
     echo "[entrypoint] Redis not ready, sleeping 1s..."
     sleep 1
 done
-
 echo "[entrypoint] Redis is ready"
 
 

justfile

@@ -0,0 +1,71 @@
+set dotenv-load := true
+set shell := ["bash", "-cu"]
+
+CLUSTER_SCRIPT := "docker/entrypoints/app-dev-entrypoint.sh"
+
+up:
+    bash {{CLUSTER_SCRIPT}}
+
+seed-mongo:
+    echo "Seeding MongoDB..."
+    bash ./scripts/mongo/seed-mongo.sh
+
+seed-mongo-auth:
+    echo "Seeding MongoDB with auth..."
+    bash ./scripts/mongo/seed-mongo.sh auth
+
+seed-mysql:
+    echo "Seeding MySQL..."
+    mysql -h 127.0.0.1 -P "$MYSQL_PORT" -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DB" < ./scripts/mysql/seed-mysql.sql
+
+seed-mysql-1gb:
+    echo "Seeding MySQL (1GB)..."
+    mysql -h 127.0.0.1 -P "$MYSQL_PORT" -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DB" < ./scripts/mysql/seed-1gb.sql
+
+seed-postgres:
+    echo "Seeding Postgres..."
+    docker exec -i -e PGPASSWORD="$PG_PASSWORD" "$PG_CONTAINER" \
+        psql -U "$PG_USER" -d "$PG_DB" < ./scripts/postgres/seed.sql
+
+seed-postgres-1gb:
+    echo "Seeding Postgres (1GB)..."
+    docker exec -i -e PGPASSWORD="$PG_PASSWORD" "$PG_CONTAINER" \
+        psql -U "$PG_USER" -d "$PG_DB" < ./scripts/postgres/seed-1gb.sql
+
+seed-sqlite:
+    echo "Seeding SQLite..."
+    bash ./scripts/sqlite/seed.sh
+    echo "Done"
+
+seed-firebird:
+    echo "Seeding Firebird..."
+    docker exec -i db-firebird isql -user alice -password fake_password /var/lib/firebird/data/mirror.fdb < ./scripts/firebird/seed.sql
+
+    echo "Verifying Firebird tables..."
+    echo "SELECT RDB\$RELATION_NAME FROM RDB\$RELATIONS WHERE RDB\$SYSTEM_FLAG = 0 AND RDB\$VIEW_BLR IS NULL;" \
+    | docker exec -i db-firebird isql -user alice -password fake_password /var/lib/firebird/data/mirror.fdb
+
+seed-mssql:
+    echo "Seeding MSSQL..."
+    docker exec -i rust-dev sqlcmd -S "db-mssql,1433" -U sa -P "$MSSQL_SA_PASSWORD" -N disable -i /app/scripts/mssql/seed.sql
+    echo "Done"
+
+seed-all:
+    just seed-mongo
+    just seed-mysql
+    just seed-postgres
+    just seed-postgres-1gb
+    just seed-sqlite
+    just seed-mongo
+    just seed-firebird
+    just seed-mssql
+
+test:
+    echo "Build test image (with grcov included)"
+    docker compose -f docker-compose.test.yml build agent-test
+    echo "Start agent-test container"
+    docker compose -f docker-compose.test.yml up -d agent-test
+    echo "Run tests inside container"
+    docker compose -f docker-compose.test.yml exec -e CARGO_INCREMENTAL -e RUSTFLAGS -e LLVM_PROFILE_FILE agent-test bash -c "cargo test --verbose && sync"
+    echo "Down volumes tests databases"
+    docker compose -f docker-compose.test.yml down --volumes

scripts/README.md

@@ -24,3 +24,7 @@ docker exec -it db-sqlite sqlite3 /workspace/data/app.db "SELECT * FROM users LI
 ```bash
 docker exec -it db-sqlite sqlite3 /workspace/data/app.db "SELECT name FROM sqlite_master WHERE type='table';"
 ```
+
+```bash
+docker compose -f docker-compose.test.yml run agent-test bash -c "cargo clean && cargo test" 
+```

scripts/firebird/seed.sql

@@ -0,0 +1,11 @@
+CREATE TABLE users (
+                       id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+                       email VARCHAR(255) NOT NULL UNIQUE,
+                       name VARCHAR(255),
+                       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+INSERT INTO users (email, name) VALUES ('alice@example.com', 'Alice');
+INSERT INTO users (email, name) VALUES ('bob@example.com', 'Bob');
+
+COMMIT;

scripts/mssql/seed.sql

@@ -0,0 +1,20 @@
+IF NOT EXISTS (SELECT name FROM sys.databases WHERE name = N'myappdb')
+    CREATE DATABASE [myappdb];
+GO
+
+USE [myappdb];
+GO
+
+IF OBJECT_ID('users', 'U') IS NULL
+    CREATE TABLE users (
+        id       INT IDENTITY(1,1) PRIMARY KEY,
+        email    NVARCHAR(255) NOT NULL UNIQUE,
+        name     NVARCHAR(255),
+        created_at DATETIME DEFAULT GETDATE()
+    );
+GO
+
+INSERT INTO users (email, name) VALUES ('alice@example.com', 'Alice');
+INSERT INTO users (email, name) VALUES ('bob@example.com',   'Bob');
+INSERT INTO users (email, name) VALUES ('charlie@example.com', 'Charlie');
+GO

scripts/sqlite/seed.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SEED_VALUE="${SEED:-}"
+
+if [ "$SEED_VALUE" = "big" ]; then
+  SQLITE_SEED_FILE="./scripts/sqlite/seed-big.sql"
+else
+  SQLITE_SEED_FILE="./scripts/sqlite/seed.sql"
+fi
+
+docker exec -u 0 db-sqlite sh -c "chmod -R 777 /workspace/data"
+docker exec -u 0 db-sqlite sh -c "touch /workspace/data/app.db"
+docker exec -i db-sqlite sh -c "sqlite3 /workspace/data/app.db" < "$SQLITE_SEED_FILE"

src/core/agent.rs

@@ -4,11 +4,11 @@ use crate::core::context::Context;
 use crate::services::backup::BackupService;
 use crate::services::config::ConfigService;
 use crate::services::cron::CronService;
+use crate::services::restore::RestoreService;
 use crate::services::status::StatusService;
 use crate::utils::common::BackupMethod;
 use std::sync::Arc;
 use tracing::info;
-use crate::services::restore::RestoreService;
 
 pub struct Agent {
     ctx: Arc<Context>,
@@ -43,22 +43,30 @@ impl Agent {
         let ping_result = self.status_service.ping(&config.databases).await?;
 
         for db in ping_result.databases.iter() {
+            let database = config
+                .databases
+                .iter()
+                .find(|cfg_db| cfg_db.generated_id == db.generated_id)
+                .unwrap();
             info!(
-                "Generated Id: {} | backup action: {} | restore action: {}",
-                db.generated_id, db.data.backup.action, db.data.restore.action
+                "Generated Id: {} | backup action: {} | restore action: {} | Database Name: {}",
+                db.generated_id, db.data.backup.action, db.data.restore.action, database.name,
             );
             let _ = self.cron_service.sync(db).await;
 
             if db.data.backup.action {
                 let _ = self
                     .backup_service
-                    .dispatch(&db.generated_id, &config, method.clone(), &db.storages, db.encrypt)
+                    .dispatch(
+                        &db.generated_id,
+                        &config,
+                        method.clone(),
+                        &db.storages,
+                        db.encrypt,
+                    )
                     .await;
             } else if db.data.restore.action {
-                let _ = self
-                    .restore_service
-                    .dispatch(db, &config)
-                    .await;
+                let _ = self.restore_service.dispatch(db, &config).await;
             }
         }
 

src/core/context.rs

@@ -35,7 +35,7 @@ impl Context {
                 panic!("Cannot initialize AgentContext due to invalid EDGE_KEY");
             }
         };
-        
+
         let server_url = format!("{}/api", edge_key.server_url);
         let api_client = ApiClient::new(server_url);
 

src/core/mod.rs

@@ -1,2 +1,2 @@
-pub mod context;
 pub mod agent;
+pub mod context;

src/domain/factory.rs

@@ -2,18 +2,24 @@ use crate::domain::mongodb::database::MongoDatabase;
 use crate::domain::mysql::database::MySQLDatabase;
 use crate::domain::postgres::database::PostgresDatabase;
 use crate::domain::postgres::{detect_format_from_file, detect_format_from_size};
+use crate::domain::redis::database::RedisDatabase;
+use crate::domain::sqlite::database::SqliteDatabase;
+use crate::domain::valkey::database::ValkeyDatabase;
+use crate::domain::firebird::database::FirebirdDatabase;
+use crate::domain::mariadb::database::MariaDBDatabase;
+use crate::domain::mssql::database::MssqlDatabase;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::{DatabaseConfig, DbType};
 use anyhow::Result;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use crate::domain::sqlite::database::SqliteDatabase;
 
 #[async_trait::async_trait]
 pub trait Database: Send + Sync {
     fn file_extension(&self) -> &'static str;
     async fn ping(&self) -> Result<bool>;
-    async fn backup(&self, backup_dir: &Path) -> Result<PathBuf>;
-    async fn restore(&self, restore_file: &Path) -> Result<()>;
+    async fn backup(&self, backup_dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf>;
+    async fn restore(&self, restore_file: &Path, logger: Arc<JobLogger>) -> Result<()>;
 }
 
 pub struct DatabaseFactory;
@@ -26,9 +32,13 @@ impl DatabaseFactory {
                 Arc::new(PostgresDatabase::new(cfg, format))
             }
             DbType::Mysql => Arc::new(MySQLDatabase::new(cfg)),
-            DbType::Mariadb => Arc::new(MySQLDatabase::new(cfg)),
+            DbType::Mariadb => Arc::new(MariaDBDatabase::new(cfg)),
             DbType::MongoDB => Arc::new(MongoDatabase::new(cfg)),
             DbType::Sqlite => Arc::new(SqliteDatabase::new(cfg)),
+            DbType::Redis => Arc::new(RedisDatabase::new(cfg)),
+            DbType::Valkey => Arc::new(ValkeyDatabase::new(cfg)),
+            DbType::Firebird => Arc::new(FirebirdDatabase::new(cfg)),
+            DbType::Mssql => Arc::new(MssqlDatabase::new(cfg)),
         }
     }
 
@@ -39,9 +49,13 @@ impl DatabaseFactory {
                 Arc::new(PostgresDatabase::new(cfg, format))
             }
             DbType::Mysql => Arc::new(MySQLDatabase::new(cfg)),
-            DbType::Mariadb => Arc::new(MySQLDatabase::new(cfg)),
+            DbType::Mariadb => Arc::new(MariaDBDatabase::new(cfg)),
             DbType::MongoDB => Arc::new(MongoDatabase::new(cfg)),
             DbType::Sqlite => Arc::new(SqliteDatabase::new(cfg)),
+            DbType::Redis => Arc::new(RedisDatabase::new(cfg)),
+            DbType::Valkey => Arc::new(ValkeyDatabase::new(cfg)),
+            DbType::Firebird => Arc::new(FirebirdDatabase::new(cfg)),
+            DbType::Mssql => Arc::new(MssqlDatabase::new(cfg)),
         }
     }
 }

src/domain/firebird/backup.rs

@@ -0,0 +1,54 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(
+    cfg: DatabaseConfig,
+    backup_dir: PathBuf,
+    file_extension: &'static str,
+    logger: Arc<JobLogger>,
+) -> Result<PathBuf> {
+    tokio::task::spawn_blocking(move || -> Result<PathBuf> {
+        logger.log("info", format!("Starting Firebird backup for database: {}", cfg.name));
+
+        let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
+        let db_path = format!("{}/{}:{}", cfg.host, cfg.port, cfg.database);
+
+        logger.log("info", format!("Firebird target: {} → {}", db_path, file_path.display()));
+        
+        let start = Instant::now();
+        let output = Command::new("gbak")
+            .arg("-b")
+            .arg("-v")
+            .arg("-user").arg(&cfg.username)
+            .arg("-password").arg(&cfg.password)
+            .arg(&db_path)
+            .arg(&file_path)
+            .output()
+            .with_context(|| format!("Failed to run gbak for {}", cfg.name))?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+        let stdout = String::from_utf8_lossy(&output.stdout).to_string();
+        let combined_output = if stderr.is_empty() && stdout.is_empty() {
+            None
+        } else {
+            Some(format!("{}{}", stdout, stderr).trim().to_string())
+        };
+
+        if !output.status.success() {
+            logger.log_command("gbak", combined_output, Some(exit_code), Some(duration_ms));
+            anyhow::bail!("Firebird backup failed for {}: {}", cfg.name, stderr);
+        }
+
+        logger.log_command("gbak", combined_output, Some(0), Some(duration_ms));
+        logger.log("info", format!("Firebird backup completed for {}", cfg.name));
+        Ok(file_path)
+    })
+    .await?
+}

src/domain/firebird/database.rs

@@ -0,0 +1,51 @@
+use super::{backup, ping, restore};
+use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use crate::utils::locks::{DbOpLock, FileLock};
+use anyhow::Result;
+use async_trait::async_trait;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+pub struct FirebirdDatabase {
+    cfg: DatabaseConfig,
+}
+
+impl FirebirdDatabase {
+    pub fn new(cfg: DatabaseConfig) -> Self {
+        Self { cfg }
+    }
+
+}
+
+#[async_trait]
+impl Database for FirebirdDatabase {
+    fn file_extension(&self) -> &'static str {
+        ".fbk"
+    }
+
+    async fn ping(&self) -> Result<bool> {
+        ping::run(self.cfg.clone()).await
+    }
+
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
+        let res = backup::run(
+            self.cfg.clone(),
+            dir.to_path_buf(),
+            self.file_extension(),
+            logger,
+        )
+        .await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+}

src/domain/firebird/mod.rs

@@ -0,0 +1,4 @@
+pub mod database;
+mod ping;
+mod backup;
+mod restore;

src/domain/firebird/ping.rs

@@ -0,0 +1,57 @@
+use std::process::Stdio;
+use tracing::{error, info};
+use tokio::io::AsyncWriteExt;
+use crate::services::config::DatabaseConfig;
+use tokio::process::Command;
+use tokio::time::{Duration, timeout};
+
+pub async fn run(cfg: DatabaseConfig) -> anyhow::Result<bool> {
+    let db_path = format!("{}/{}:{}", cfg.host, cfg.port, cfg.database);
+
+    info!("Running Ping database from {}", db_path);
+
+    let mut child = Command::new("isql-fb")
+        .arg("-q")
+        .arg("-user")
+        .arg(&cfg.username)
+        .arg("-password")
+        .arg(&cfg.password)
+        .arg(&db_path)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()?;
+
+    let query = b"SELECT 1 FROM RDB$DATABASE;\nQUIT;\n";
+
+    if let Some(mut stdin) = child.stdin.take() {
+        stdin.write_all(query).await?;
+    }
+
+    let output = match timeout(Duration::from_secs(5), child.wait_with_output()).await {
+        Ok(res) => res?,
+        Err(_) => return Ok(false),
+    };
+
+    if !output.status.success() {
+        error!("Error output for firebird: {:?}", output);
+        return Ok(false);
+    }
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    let stderr = String::from_utf8_lossy(&output.stderr);
+
+    if stderr.to_lowercase().contains("error") {
+        error!("Error output for firebird: {:?}", output);
+        return Ok(false);
+    }
+
+    if stdout.contains("1") {
+        return Ok(true);
+    }
+
+    info!("stdout {}", stdout);
+    error!("stderr {}", stderr);
+
+    Ok(false)
+}

src/domain/firebird/restore.rs

@@ -0,0 +1,48 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
+    tokio::task::spawn_blocking(move || -> Result<()> {
+        logger.log("debug", format!("Starting Firebird restore for database {}", cfg.name));
+
+        let db_path = format!("{}/{}:{}", cfg.host, cfg.port, cfg.database);
+
+        logger.log("info", format!("Restore source: {}", restore_file.display()));
+        logger.log("info", format!("Restore target: {}", db_path));
+
+        let start = Instant::now();
+        let output = Command::new("gbak")
+            .arg("-c")
+            .arg("-v")
+            .arg("-replace_database")
+            .arg("-user")
+            .arg(&cfg.username)
+            .arg("-password")
+            .arg(&cfg.password)
+            .arg(&restore_file)
+            .arg(&db_path)
+            .output()
+            .with_context(|| format!("Failed to run gbak restore for {}", cfg.name))?;
+
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+
+        if !output.status.success() {
+            logger.log_command("gbak", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            logger.log("error", format!("Firebird restore failed for {}: {}", cfg.name, stderr));
+            anyhow::bail!("Firebird restore failed for {}: {}", cfg.name, stderr);
+        }
+
+        logger.log_command("gbak", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("Firebird restore completed for {}", cfg.name));
+
+        Ok(())
+    })
+    .await?
+}

src/domain/mariadb/backup.rs

@@ -0,0 +1,76 @@
+use crate::domain::mariadb::connection::{select_mariadb_path, server_version};
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::collections::HashMap;
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(
+    cfg: DatabaseConfig,
+    backup_dir: PathBuf,
+    env: HashMap<String, String>,
+    file_extension: &'static str,
+    logger: Arc<JobLogger>,
+) -> Result<PathBuf> {
+    tokio::task::spawn_blocking(move || -> Result<PathBuf> {
+        logger.log("info", format!("Starting backup for database {}", cfg.name));
+
+        let version = match futures::executor::block_on(server_version(&cfg)) {
+            Ok(v) => {
+                logger.log("info", format!("MariaDB version detected: {}", v));
+                v
+            }
+            Err(e) => {
+                logger.log("error", format!("Failed to get server version: {}", e));
+                return Err(e.into());
+            }
+        };
+
+        let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
+        let _mariadb_dump = select_mariadb_path(&version).join("mariadb-dump");
+
+        logger.log("debug", format!("Using mariadb-dump at {}", _mariadb_dump.display()));
+        logger.log("info", format!("Running mariadb-dump for {}", cfg.name));
+
+        let start = Instant::now();
+        let output = Command::new("mariadb-dump")
+            .arg("--host").arg(&cfg.host)
+            .arg("--port").arg(cfg.port.to_string())
+            .arg("--user").arg(&cfg.username)
+            .arg("--routines")
+            .arg("--events")
+            .arg("--triggers")
+            .arg("--single-transaction")
+            .arg("--quick")
+            .arg("--skip-lock-tables")
+            .arg("--no-create-db")
+            .arg("--skip-add-drop-table")
+            .arg("--compress")
+            .arg("--verbose")
+            .arg("--max-allowed-packet=512M")
+            .arg("--net-buffer-length=16K")
+            .arg("--default-character-set=utf8mb4")
+            .arg(&cfg.database)
+            .arg("-r").arg(&file_path)
+            .envs(env)
+            .output()
+            .with_context(|| format!("Failed to run mariadb-dump for {}", cfg.name))?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        if !output.status.success() {
+            let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+            logger.log_command("mariadb-dump", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            anyhow::bail!("Mariadb backup failed for {}: {}", cfg.name, stderr);
+        }
+
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+        logger.log_command("mariadb-dump", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("mariadb-dump completed for {}", cfg.name));
+        Ok(file_path)
+    })
+    .await?
+}

src/domain/mariadb/connection.rs

@@ -0,0 +1,45 @@
+use std::path::PathBuf;
+use crate::services::config::DatabaseConfig;
+use anyhow::Result;
+use std::process::Command;
+
+pub async fn server_version(cfg: &DatabaseConfig) -> Result<String> {
+    let output = Command::new("mariadb")
+        .arg("--host")
+        .arg(&cfg.host)
+        .arg("--port")
+        .arg(cfg.port.to_string())
+        .arg("--user")
+        .arg(&cfg.username)
+        .arg("-e")
+        .arg("SELECT VERSION();")
+        .env("MYSQL_PWD", &cfg.password)
+        .output()?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        anyhow::bail!("Version query failed: {}", stderr);
+    }
+
+    let version = String::from_utf8_lossy(&output.stdout)
+        .lines()
+        .nth(1)
+        .unwrap_or_default()
+        .trim()
+        .to_string();
+
+    Ok(version)
+}
+
+
+pub fn select_mariadb_path(version: &str) -> PathBuf {
+    let mut parts = version.split('.');
+    let major = parts.next().and_then(|v| v.parse::<u32>().ok()).unwrap_or(10);
+    let minor = parts.next().and_then(|v| v.parse::<u32>().ok()).unwrap_or(0);
+
+    if major < 10 || (major == 10 && minor <= 6) {
+        "/usr/local/mariadb-10.6/bin".into()
+    } else {
+        "/usr/local/mariadb-12.1/bin".into()
+    }
+}

src/domain/mariadb/database.rs

@@ -0,0 +1,58 @@
+use super::{backup, ping, restore};
+use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use crate::utils::locks::{DbOpLock, FileLock};
+use anyhow::Result;
+use async_trait::async_trait;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+pub struct MariaDBDatabase {
+    cfg: DatabaseConfig,
+}
+
+impl MariaDBDatabase {
+    pub fn new(cfg: DatabaseConfig) -> Self {
+        Self { cfg }
+    }
+
+    fn build_env(&self) -> HashMap<String, String> {
+        let mut envs = std::env::vars().collect::<HashMap<_, _>>();
+        envs.insert("MYSQL_PWD".to_string(), self.cfg.password.to_string());
+        envs
+    }
+}
+
+#[async_trait]
+impl Database for MariaDBDatabase {
+    fn file_extension(&self) -> &'static str {
+        ".sql"
+    }
+
+    async fn ping(&self) -> Result<bool> {
+        ping::run(self.cfg.clone(), self.build_env().clone()).await
+    }
+
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
+        let res = backup::run(
+            self.cfg.clone(),
+            dir.to_path_buf(),
+            self.build_env().clone(),
+            self.file_extension(),
+            logger,
+        )
+        .await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+}

src/domain/mariadb/mod.rs

@@ -0,0 +1,5 @@
+pub mod backup;
+mod connection;
+pub mod database;
+mod ping;
+mod restore;

src/domain/mariadb/ping.rs

@@ -0,0 +1,28 @@
+use crate::services::config::DatabaseConfig;
+use std::collections::HashMap;
+use tokio::process::Command;
+use tokio::time::{Duration, timeout};
+
+pub async fn run(cfg: DatabaseConfig, env: HashMap<String, String>) -> anyhow::Result<bool> {
+    let mut cmd = Command::new("mysqladmin");
+    cmd.arg("--host")
+        .arg(cfg.host)
+        .arg("--port")
+        .arg(cfg.port.to_string())
+        .arg("--user")
+        .arg(cfg.username)
+        .arg("ping")
+        .envs(env);
+
+    let result = timeout(Duration::from_secs(10), cmd.output()).await;
+
+    match result {
+        Ok(output) => {
+            let output = output?;
+            Ok(output.status.success())
+        }
+        Err(_) => Ok(false),
+    }
+}
+
+

src/domain/mariadb/restore.rs

@@ -0,0 +1,97 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
+    let handle = tokio::task::spawn_blocking(move || -> Result<()> {
+        logger.log("info", format!("Starting restore for database {}", cfg.name));
+
+        let mut sql_content = String::new();
+        let mut file = File::open(&restore_file)
+            .with_context(|| format!("Failed to open restore file {}", restore_file.display()))?;
+        file.read_to_string(&mut sql_content)
+            .with_context(|| format!("Failed to read restore file {}", restore_file.display()))?;
+
+        let drop_create_cmd = format!(
+            "DROP DATABASE IF EXISTS `{0}`; CREATE DATABASE `{0}`;",
+            cfg.database
+        );
+
+        let drop_start = Instant::now();
+        let drop_output = Command::new("mariadb")
+            .arg("--host")
+            .arg(&cfg.host)
+            .arg("--port")
+            .arg(cfg.port.to_string())
+            .arg("--user")
+            .arg(&cfg.username)
+            .arg("-e")
+            .arg(&drop_create_cmd)
+            .env("MYSQL_PWD", &cfg.password)
+            .output()
+            .with_context(|| format!("Failed to drop/recreate database {}", cfg.name))?;
+
+        let drop_duration_ms = drop_start.elapsed().as_millis() as f64;
+        let drop_exit_code = drop_output.status.code().unwrap_or(-1);
+        let drop_stderr = String::from_utf8_lossy(&drop_output.stderr).to_string();
+
+        if !drop_output.status.success() {
+            logger.log_command("mariadb", Some(drop_stderr.clone()), Some(drop_exit_code), Some(drop_duration_ms));
+            logger.log("error", format!("Drop/create database failed for {}: {}", cfg.name, drop_stderr));
+            anyhow::bail!("Failed to drop/recreate database {}", cfg.name);
+        }
+        logger.log_command("mariadb", if drop_stderr.is_empty() { None } else { Some(drop_stderr) }, Some(0), Some(drop_duration_ms));
+        logger.log("info", format!("Database {} dropped and recreated", cfg.name));
+
+        let start = Instant::now();
+
+        let mut child = Command::new("mariadb")
+            .arg("--host")
+            .arg(&cfg.host)
+            .arg("--port")
+            .arg(cfg.port.to_string())
+            .arg("--user")
+            .arg(&cfg.username)
+            .arg("--database")
+            .arg(&cfg.database)
+            .env("MYSQL_PWD", &cfg.password)
+            .stdin(std::process::Stdio::piped())
+            .spawn()
+            .with_context(|| format!("Failed to start MariaDB restore for {}", cfg.name))?;
+
+        let mut stdin = child.stdin.take().context("Failed to open child stdin")?;
+        stdin
+            .write_all(sql_content.as_bytes())
+            .context("Failed to write SQL content to MariaDB stdin")?;
+        stdin.flush()?;
+        drop(stdin);
+
+        let output = child
+            .wait_with_output()
+            .with_context(|| format!("Failed to complete MariaDB restore for {}", cfg.name))?;
+
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+
+        if !output.status.success() {
+            logger.log_command("mariadb", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            logger.log("error", format!("MariaDB restore failed for {}: {}", cfg.name, stderr));
+            anyhow::bail!("MariaDB restore failed for {}", cfg.name);
+        }
+
+        logger.log_command("mariadb", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("Restore finished successfully for database {}", cfg.name));
+        Ok(())
+    });
+
+    handle.await??;
+
+    Ok(())
+}

src/domain/mod.rs

@@ -1,6 +1,10 @@
 pub mod factory;
-pub mod postgres;
-pub mod mysql;
 mod mongodb;
+pub mod mysql;
+pub mod postgres;
+mod redis;
 mod sqlite;
-
+mod valkey;
+mod mariadb;
+mod firebird;
+pub mod mssql;

src/domain/mongodb/backup.rs

@@ -1,35 +1,48 @@
 use crate::domain::mongodb::connection::{get_mongo_uri, select_mongo_path};
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
 pub async fn run(
     cfg: DatabaseConfig,
     backup_dir: PathBuf,
     file_extension: &'static str,
+    logger: Arc<JobLogger>,
 ) -> Result<PathBuf> {
     tokio::task::spawn_blocking(move || -> Result<PathBuf> {
-        debug!("Starting MongoDB backup for database {}", cfg.name);
+        logger.log("info", format!("Starting MongoDB backup for database {}", cfg.name));
 
         let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
         let mongodump = select_mongo_path().join("mongodump");
         let uri = get_mongo_uri(cfg.clone())?;
 
+        logger.log("info", format!("Running mongodump for {}", cfg.name));
+
+        let start = Instant::now();
         let output = Command::new(mongodump)
             .arg(format!("--uri={}", uri))
             .arg(format!("--archive={}", file_path.display()))
             .arg("--gzip")
+            .arg("--verbose")
             .output()
             .context("MongoDB backup failed")?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
 
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            error!("MongoDB backup failed for {}: {}", cfg.name, stderr);
+            logger.log("error", format!("MongoDB backup failed for {}: {}", cfg.name, stderr));
+            logger.log_command("mongodump", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
             anyhow::bail!("MongoDB backup failed for {}: {}", cfg.name, stderr);
         }
-        info!("MongoDB backup completed for {}", cfg.name);
+
+        logger.log_command("mongodump", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("MongoDB backup completed for {}", cfg.name));
         Ok(file_path)
     })
     .await?

src/domain/mongodb/connection.rs

@@ -16,9 +16,11 @@ pub fn select_mongo_path() -> std::path::PathBuf {
 }
 
 pub fn get_mongo_uri(cfg: DatabaseConfig) -> Result<String> {
-
     if cfg.username.is_empty() || cfg.password.is_empty() {
-        Ok(format!("mongodb://{}:{}/{}", cfg.host, cfg.port, cfg.database))
+        Ok(format!(
+            "mongodb://{}:{}/{}",
+            cfg.host, cfg.port, cfg.database
+        ))
     } else {
         Ok(format!(
             "mongodb://{}:{}@{}:{}/{}?authSource=admin",
@@ -28,3 +30,16 @@ pub fn get_mongo_uri(cfg: DatabaseConfig) -> Result<String> {
 }
 
 
+pub fn extract_db_name(dry_output: &str) -> Option<String> {
+    let mut dbs = std::collections::HashSet::new();
+    for line in dry_output.lines() {
+        if let Some(pos) = line.find("archive prelude ") {
+            let rest = &line[pos + "archive prelude ".len()..];
+            if let Some(dot) = rest.find('.') {
+                let db = &rest[..dot];
+                dbs.insert(db.to_string());
+            }
+        }
+    }
+    dbs.into_iter().next()
+}

src/domain/mongodb/database.rs

@@ -1,9 +1,11 @@
 use anyhow::Result;
 use async_trait::async_trait;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use super::{backup, ping, restore};
 use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use crate::utils::locks::{DbOpLock, FileLock};
 
@@ -27,21 +29,16 @@ impl Database for MongoDatabase {
         ping::run(self.cfg.clone()).await
     }
 
-    async fn backup(&self, dir: &Path) -> Result<PathBuf> {
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
-        let res = backup::run(
-            self.cfg.clone(),
-            dir.to_path_buf(),
-            self.file_extension(),
-        )
-            .await;
+        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.file_extension(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }
 
-    async fn restore(&self, file: &Path) -> Result<()> {
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
-        let res = restore::run(self.cfg.clone(), file.to_path_buf()).await;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }

src/domain/mongodb/mod.rs

@@ -1,5 +1,5 @@
 mod backup;
-mod restore;
+mod connection;
 pub mod database;
 mod ping;
-mod connection;
+mod restore;

src/domain/mongodb/ping.rs

@@ -24,7 +24,7 @@ pub async fn run(cfg: DatabaseConfig) -> Result<bool> {
             error!("Full Error: {}", e);
             error!("Check you database network connectivity");
             error!("----------------------------------------");
-            Err(anyhow::anyhow!("Ping failed for {}: {}", cfg.name, e))
+            Ok(false)
         }
     }
 }

src/domain/mongodb/restore.rs

@@ -1,32 +1,74 @@
-use crate::domain::mongodb::connection::{get_mongo_uri, select_mongo_path};
+use crate::domain::mongodb::connection::{extract_db_name, get_mongo_uri, select_mongo_path};
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
-pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
     tokio::task::spawn_blocking(move || -> Result<()> {
-        debug!("Starting MongoDB restore for database {}", cfg.name);
+        logger.log("debug", format!("Starting MongoDB restore for database {}", cfg.name));
 
         let mongorestore = select_mongo_path().join("mongorestore");
         let uri = get_mongo_uri(cfg.clone())?;
 
-        let output = Command::new(mongorestore)
+        let dry_start = Instant::now();
+        let dry_run = Command::new(&mongorestore)
+            .arg(format!(
+                "--uri={}",
+                format!(
+                    "mongodb://{}:{}@{}:{}/?authSource=admin",
+                    cfg.username, cfg.password, cfg.host, cfg.port
+                )
+            ))
+            .arg(format!("--archive={}", restore_file.display()))
+            .arg("--gzip")
+            .arg("--dryRun")
+            .arg("--verbose")
+            .output()?;
+
+        let dry_duration_ms = dry_start.elapsed().as_millis() as f64;
+        let dry_exit_code = dry_run.status.code().unwrap_or(-1);
+        let dry_output = String::from_utf8_lossy(&dry_run.stderr);
+        logger.log_command(
+            "mongorestore --dryRun",
+            if dry_output.is_empty() { None } else { Some(dry_output.to_string()) },
+            Some(dry_exit_code),
+            Some(dry_duration_ms),
+        );
+        let source_db = extract_db_name(&dry_output).unwrap_or_else(|| {
+            logger.log("info", format!("Could not detect source database from archive, falling back to configured database: {}", cfg.database));
+            cfg.database.clone()
+        });
+
+        logger.log("info", format!("Using source database in archive: {}", source_db));
+
+        let start = Instant::now();
+        let output = Command::new(&mongorestore)
             .arg(format!("--uri={}", uri))
             .arg(format!("--archive={}", restore_file.display()))
             .arg("--gzip")
             .arg("--drop")
+            .arg(format!("--nsInclude={}.*", source_db))
+            .arg(format!("--nsFrom={}.*", source_db))
+            .arg(format!("--nsTo={}.*", cfg.database))
             .output()
             .with_context(|| format!("Failed to run mongorestore for {}", cfg.name))?;
 
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            error!("MongoDB restore failed for {}: {}", cfg.name, stderr);
-            anyhow::bail!("MongoDB restore failed for : {}", cfg.name);
+            logger.log_command("mongorestore", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            logger.log("error", format!("MongoDB restore failed for {}: {}", cfg.name, stderr));
+            anyhow::bail!("MongoDB restore failed for: {}", cfg.name);
         }
 
-        info!("MongoDB restore completed for {}", cfg.name);
+        logger.log_command("mongorestore", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("MongoDB restore completed for {}", cfg.name));
         Ok(())
     })
     .await?

src/domain/mssql/backup.rs

@@ -0,0 +1,56 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(
+    cfg: DatabaseConfig,
+    backup_dir: PathBuf,
+    file_extension: &'static str,
+    logger: Arc<JobLogger>,
+) -> Result<PathBuf> {
+    tokio::task::spawn_blocking(move || -> Result<PathBuf> {
+        logger.log("info", format!("Starting MSSQL backup for database {}", cfg.name));
+
+        let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
+        let connection_string = format!(
+            "Server=tcp:{},{};Database={};User Id={};Password={};TrustServerCertificate=True;Encrypt=False",
+            cfg.host, cfg.port, cfg.database, cfg.username, cfg.password
+        );
+
+        logger.log("info", format!("MSSQL backup: {}:{}/{} → {}", cfg.host, cfg.port, cfg.database, file_path.display()));
+
+        let start = Instant::now();
+        let output = Command::new("sqlpackage")
+            .arg("/a:Export")
+            .arg(format!("/scs:{}", connection_string))
+            .arg(format!("/tf:{}", file_path.display()))
+            .output()
+            .with_context(|| format!("Failed to run sqlpackage for {}", cfg.name))?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+        let stdout = String::from_utf8_lossy(&output.stdout).to_string();
+
+        if !output.status.success() {
+            logger.log("error", format!("MSSQL backup failed — stderr: {} stdout: {}", stderr, stdout));
+            let out = format!("stderr: {} stdout: {}", stderr, stdout);
+            logger.log_command("sqlpackage", Some(out), Some(exit_code), Some(duration_ms));
+            anyhow::bail!("MSSQL backup failed for {}: {}", cfg.name, stderr);
+        }
+
+        let combined = if stdout.is_empty() && stderr.is_empty() {
+            None
+        } else {
+            Some(format!("{}{}", stdout, stderr).trim().to_string())
+        };
+        logger.log_command("sqlpackage", combined, Some(0), Some(duration_ms));
+        logger.log("info", format!("MSSQL backup completed for {}", cfg.name));
+        Ok(file_path)
+    })
+    .await?
+}

src/domain/mssql/connection.rs

@@ -0,0 +1,18 @@
+use crate::services::config::DatabaseConfig;
+use anyhow::Result;
+use tiberius::{AuthMethod, Client, Config};
+use tokio::net::TcpStream;
+use tokio_util::compat::{Compat, TokioAsyncWriteCompatExt};
+
+pub async fn build_client(cfg: &DatabaseConfig) -> Result<Client<Compat<TcpStream>>> {
+    let mut config = Config::new();
+    config.host(&cfg.host);
+    config.port(cfg.port);
+    config.authentication(AuthMethod::sql_server(&cfg.username, &cfg.password));
+    config.trust_cert();
+
+    let tcp = TcpStream::connect(config.get_addr()).await?;
+    tcp.set_nodelay(true)?;
+    let client = Client::connect(config, tcp.compat_write()).await?;
+    Ok(client)
+}

src/domain/mssql/database.rs

@@ -0,0 +1,50 @@
+use super::{backup, ping, restore};
+use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use crate::utils::locks::{DbOpLock, FileLock};
+use anyhow::Result;
+use async_trait::async_trait;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+pub struct MssqlDatabase {
+    cfg: DatabaseConfig,
+}
+
+impl MssqlDatabase {
+    pub fn new(cfg: DatabaseConfig) -> Self {
+        Self { cfg }
+    }
+}
+
+#[async_trait]
+impl Database for MssqlDatabase {
+    fn file_extension(&self) -> &'static str {
+        ".bacpac"
+    }
+
+    async fn ping(&self) -> Result<bool> {
+        ping::run(self.cfg.clone()).await
+    }
+
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
+        let res = backup::run(
+            self.cfg.clone(),
+            dir.to_path_buf(),
+            self.file_extension(),
+            logger,
+        )
+        .await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+}

src/domain/mssql/mod.rs

@@ -0,0 +1,5 @@
+pub mod database;
+mod connection;
+mod ping;
+mod backup;
+mod restore;

src/domain/mssql/ping.rs

@@ -0,0 +1,24 @@
+use crate::services::config::DatabaseConfig;
+use anyhow::Result;
+use tracing::{error, info};
+
+pub async fn run(cfg: DatabaseConfig) -> Result<bool> {
+    info!("Running ping for MSSQL database {}", cfg.name);
+
+    match super::connection::build_client(&cfg).await {
+        Ok(mut client) => match client.simple_query("SELECT 1").await {
+            Ok(_) => {
+                info!("MSSQL ping succeeded for {}", cfg.name);
+                Ok(true)
+            }
+            Err(e) => {
+                error!("MSSQL ping query failed for {}: {:?}", cfg.name, e);
+                Ok(false)
+            }
+        },
+        Err(e) => {
+            error!("MSSQL connection failed for {}: {:?}", cfg.name, e);
+            Ok(false)
+        }
+    }
+}

src/domain/mssql/restore.rs

@@ -0,0 +1,54 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
+    tokio::task::spawn_blocking(move || -> Result<()> {
+        logger.log("debug", format!("Starting MSSQL restore for database {}", cfg.name));
+
+        let connection_string = format!(
+            "Server=tcp:{},{};Database={};User Id={};Password={};TrustServerCertificate=True;Encrypt=False",
+            cfg.host, cfg.port, cfg.database, cfg.username, cfg.password
+        );
+
+        logger.log("info", format!(
+            "MSSQL restore: {} → {}:{}/{}",
+            restore_file.display(),
+            cfg.host,
+            cfg.port,
+            cfg.database
+        ));
+
+        let start = Instant::now();
+        let output = Command::new("sqlpackage")
+            .arg("/a:Import")
+            .arg(format!("/tcs:{}", connection_string))
+            .arg(format!("/sf:{}", restore_file.display()))
+            .output()
+            .with_context(|| format!("Failed to run sqlpackage restore for {}", cfg.name))?;
+
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+        let stdout = String::from_utf8_lossy(&output.stdout).to_string();
+        let combined = format!("{}{}", stdout, stderr);
+
+        if !output.status.success() {
+            logger.log_command("sqlpackage", if combined.is_empty() { None } else { Some(combined.clone()) }, Some(exit_code), Some(duration_ms));
+            logger.log("error", format!(
+                "MSSQL restore failed for {} — stderr: {} stdout: {}",
+                cfg.name, stderr, stdout
+            ));
+            anyhow::bail!("MSSQL restore failed for {}: {}", cfg.name, stderr);
+        }
+
+        logger.log_command("sqlpackage", if combined.is_empty() { None } else { Some(combined) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("MSSQL restore completed for {}", cfg.name));
+        Ok(())
+    })
+    .await?
+}

src/domain/mysql/backup.rs

@@ -1,62 +1,72 @@
-use crate::domain::mysql::connection::{server_version};
+use crate::domain::mysql::connection::server_version;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
 pub async fn run(
     cfg: DatabaseConfig,
     backup_dir: PathBuf,
     env: HashMap<String, String>,
     file_extension: &'static str,
+    logger: Arc<JobLogger>,
 ) -> Result<PathBuf> {
     tokio::task::spawn_blocking(move || -> Result<PathBuf> {
-        debug!("Starting backup for database {}", cfg.name);
+        logger.log("info", format!("Starting backup for database {}", cfg.name));
 
-        let version = match futures::executor::block_on(server_version(&cfg)) {
+        let _version = match futures::executor::block_on(server_version(&cfg)) {
             Ok(v) => {
-                debug!("Mysql version detected: {}", v);
+                logger.log("debug", format!("MySQL version detected: {}", v));
                 v
             }
             Err(e) => {
-                error!("Failed to get server version for {}: {:?}", cfg.name, e);
+                logger.log("error", format!("Failed to get server version: {}", e));
                 return Err(e.into());
             }
         };
 
-        info!("Mysql version found: {}", version);
-
         let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
 
+        logger.log("info", format!("Running mysqldump for {}", cfg.name));
+
+        let start = Instant::now();
         let output = Command::new("mysqldump")
-            .arg("--host")
-            .arg(cfg.host)
-            .arg("--port")
-            .arg(cfg.port.to_string())
-            .arg("--user")
-            .arg(cfg.username)
+            .arg("--host").arg(&cfg.host)
+            .arg("--port").arg(cfg.port.to_string())
+            .arg("--user").arg(&cfg.username)
             .arg("--routines")
             .arg("--events")
             .arg("--triggers")
             .arg("--verbose")
             .arg("--single-transaction")
             .arg("--quick")
-            .arg("--add-drop-database")
-            .arg("--databases")
-            .arg(cfg.database)
-            .arg("-r")
-            .arg(&file_path)
+            .arg("--skip-lock-tables")
+            .arg("--skip-add-drop-table")
+            .arg("--no-create-db")
+            .arg("--default-character-set=utf8mb4")
+            .arg(&cfg.database)
+            .arg("-r").arg(&file_path)
             .envs(env)
             .output()
             .with_context(|| format!("Failed to run mysqldump for {}", cfg.name))?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let _stdout = String::from_utf8_lossy(&output.stdout).to_string();
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
 
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
+            logger.log_command("mysqldump", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
             anyhow::bail!("MySQL backup failed for {}: {}", cfg.name, stderr);
         }
 
+        logger.log_command("mysqldump", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("mysqldump completed for {}", cfg.name));
+
         Ok(file_path)
     })
     .await?

src/domain/mysql/connection.rs

@@ -1,14 +1,17 @@
 use crate::services::config::DatabaseConfig;
-use std::process::Command;
 use anyhow::Result;
+use std::process::Command;
 
 pub async fn server_version(cfg: &DatabaseConfig) -> Result<String> {
-
     let output = Command::new("mysql")
-        .arg("--host").arg(&cfg.host)
-        .arg("--port").arg(cfg.port.to_string())
-        .arg("--user").arg(&cfg.username)
-        .arg("-e").arg("SELECT VERSION();")
+        .arg("--host")
+        .arg(&cfg.host)
+        .arg("--port")
+        .arg(cfg.port.to_string())
+        .arg("--user")
+        .arg(&cfg.username)
+        .arg("-e")
+        .arg("SELECT VERSION();")
         .env("MYSQL_PWD", &cfg.password)
         .output()?;
 
@@ -19,11 +22,10 @@ pub async fn server_version(cfg: &DatabaseConfig) -> Result<String> {
 
     let version = String::from_utf8_lossy(&output.stdout)
         .lines()
-        .nth(1) // skip column header
+        .nth(1)
         .unwrap_or_default()
         .trim()
         .to_string();
 
     Ok(version)
 }
-

src/domain/mysql/database.rs

@@ -1,14 +1,13 @@
-use std::collections::HashMap;
-use anyhow::Result;
-use async_trait::async_trait;
-use std::path::{Path, PathBuf};
-use super::{
-    backup,
-    ping, restore,
-};
+use super::{backup, ping, restore};
 use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use crate::utils::locks::{DbOpLock, FileLock};
+use anyhow::Result;
+use async_trait::async_trait;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 pub struct MySQLDatabase {
     cfg: DatabaseConfig,
@@ -36,16 +35,23 @@ impl Database for MySQLDatabase {
         ping::run(self.cfg.clone(), self.build_env().clone()).await
     }
 
-    async fn backup(&self, dir: &Path) -> Result<PathBuf> {
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
-        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.build_env().clone(), self.file_extension()).await;
+        let res = backup::run(
+            self.cfg.clone(),
+            dir.to_path_buf(),
+            self.build_env().clone(),
+            self.file_extension(),
+            logger,
+        )
+        .await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }
 
-    async fn restore(&self, file: &Path) -> Result<()> {
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
-        let res = restore::run(self.cfg.clone(), file.to_path_buf()).await;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }

src/domain/mysql/mod.rs

@@ -1,5 +1,5 @@
 pub mod backup;
+mod connection;
 pub mod database;
-mod restore;
 mod ping;
-mod connection;
+mod restore;

src/domain/mysql/ping.rs

@@ -4,8 +4,7 @@ use tokio::process::Command;
 use tokio::time::{Duration, timeout};
 
 pub async fn run(cfg: DatabaseConfig, env: HashMap<String, String>) -> anyhow::Result<bool> {
-
-    let mut cmd = Command::new("mysqladmin");
+    let mut cmd = Command::new("mariadb-admin");
     cmd.arg("--host")
         .arg(cfg.host)
         .arg("--port")

src/domain/mysql/restore.rs

@@ -1,14 +1,16 @@
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
-pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
     let handle = tokio::task::spawn_blocking(move || -> Result<()> {
-        debug!("Starting restore for database {}", cfg.name);
+        logger.log("info", format!("Starting restore for database {}", cfg.name));
 
         let mut sql_content = String::new();
         let mut file = File::open(&restore_file)
@@ -17,11 +19,12 @@ pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
             .with_context(|| format!("Failed to read restore file {}", restore_file.display()))?;
 
         let drop_create_cmd = format!(
-            "DROP DATABASE IF EXISTS {0}; CREATE DATABASE {0};",
+            "DROP DATABASE IF EXISTS `{0}`; CREATE DATABASE `{0}`;",
             cfg.database
         );
 
-        let drop_status = Command::new("mysql")
+        let drop_start = Instant::now();
+        let drop_output = Command::new("mysql")
             .arg("--host")
             .arg(&cfg.host)
             .arg("--port")
@@ -31,14 +34,22 @@ pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
             .arg("-e")
             .arg(&drop_create_cmd)
             .env("MYSQL_PWD", &cfg.password)
-            .status()
+            .output()
             .with_context(|| format!("Failed to drop/recreate database {}", cfg.name))?;
 
-        if !drop_status.success() {
-            error!("Drop/create database failed for {}", cfg.name);
+        let drop_duration_ms = drop_start.elapsed().as_millis() as f64;
+        let drop_exit_code = drop_output.status.code().unwrap_or(-1);
+        let drop_stderr = String::from_utf8_lossy(&drop_output.stderr).to_string();
+
+        if !drop_output.status.success() {
+            logger.log_command("mysql", Some(drop_stderr.clone()), Some(drop_exit_code), Some(drop_duration_ms));
+            logger.log("error", format!("Drop/create database failed for {}: {}", cfg.name, drop_stderr));
             anyhow::bail!("Failed to drop/recreate database {}", cfg.name);
         }
-        info!("Database {} dropped and recreated", cfg.name);
+        logger.log_command("mysql", if drop_stderr.is_empty() { None } else { Some(drop_stderr) }, Some(0), Some(drop_duration_ms));
+        logger.log("info", format!("Database {} dropped and recreated", cfg.name));
+
+        let start = Instant::now();
 
         let mut child = Command::new("mysql")
             .arg("--host")
@@ -47,6 +58,7 @@ pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
             .arg(cfg.port.to_string())
             .arg("--user")
             .arg(&cfg.username)
+            .arg("--database")
             .arg(&cfg.database)
             .env("MYSQL_PWD", &cfg.password)
             .stdin(std::process::Stdio::piped())
@@ -64,13 +76,18 @@ pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
             .wait_with_output()
             .with_context(|| format!("Failed to complete mysql restore for {}", cfg.name))?;
 
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            error!("MySQL restore failed for {}: {}", cfg.name, stderr);
+            logger.log_command("mysql", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            logger.log("error", format!("MySQL restore failed for {}: {}", cfg.name, stderr));
             anyhow::bail!("MySQL restore failed for {}", cfg.name);
         }
 
-        info!("Restore finished successfully for database {}", cfg.name);
+        logger.log_command("mysql", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("Restore finished successfully for database {}", cfg.name));
         Ok(())
     });
 

src/domain/postgres/backup.rs

@@ -1,81 +1,89 @@
 use anyhow::Result;
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
 use super::connection::{select_pg_path, server_version};
 use super::format::PostgresDumpFormat;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 
 pub async fn run(
     cfg: DatabaseConfig,
     format: PostgresDumpFormat,
     backup_dir: PathBuf,
+    logger: Arc<JobLogger>,
 ) -> Result<PathBuf> {
     tokio::task::spawn_blocking(move || -> Result<PathBuf> {
-        debug!("Starting backup for database {}", cfg.name);
+        logger.log("info", format!("Starting backup for database {}", cfg.name));
 
         let version = match futures::executor::block_on(server_version(&cfg)) {
             Ok(v) => {
-                debug!("Postgres version detected: {}", v);
+                logger.log("debug", format!("Postgres version detected: {}", v));
                 v
             }
             Err(e) => {
-                error!("Failed to get server version for {}: {:?}", cfg.name, e);
+                logger.log("error", format!("Failed to get server version: {}", e));
                 return Err(e.into());
             }
         };
 
         let pg_dump = select_pg_path(&version).join("pg_dump");
-        debug!("Using pg_dump at {:?}", pg_dump);
+        logger.log("debug", format!("Using pg_dump at {:?}", pg_dump));
 
         match format {
             PostgresDumpFormat::Fc => {
-                info!("Running FC backup for {}", cfg.name);
+                logger.log("info", format!("Running FC backup for {}", cfg.name));
+
                 let file_path = backup_dir.join(format!("{}.dump", cfg.generated_id));
                 let url = format!(
                     "postgresql://{}:{}@{}:{}/{}",
                     cfg.username, cfg.password, cfg.host, cfg.port, cfg.database
                 );
 
-                let status = Command::new(&pg_dump)
-                    .arg("--dbname")
-                    .arg(&url)
+                let start = Instant::now();
+                let output = Command::new(&pg_dump)
+                    .arg("--dbname").arg(&url)
                     .arg("-Fc")
-                    .arg("-f")
-                    .arg(&file_path)
+                    .arg("-f").arg(&file_path)
                     .arg("-v")
                     .arg("--compress=3")
-                    .status();
+                    .output();
+                let duration_ms = start.elapsed().as_millis() as f64;
 
-                match status {
-                    Ok(s) if s.success() => info!(
-                        "FC backup completed successfully for {} at {:?}",
-                        cfg.name, file_path
-                    ),
-                    Ok(s) => {
-                        error!("FC backup failed with status {:?} for {}", s, cfg.name);
-                        anyhow::bail!("Postgres backup failed for {}", cfg.name);
+                match output {
+                    Ok(o) => {
+                        let stderr = String::from_utf8_lossy(&o.stderr).to_string();
+                        let exit_code = o.status.code().unwrap_or(-1);
+
+                        if o.status.success() {
+                            logger.log("info", format!("FC backup completed successfully for {} at {:?}", cfg.name, file_path));
+                            logger.log_command("pg_dump", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+                        } else {
+                            logger.log("error", format!("FC backup failed with status {:?} for {}", o.status, cfg.name));
+                            logger.log_command("pg_dump", Some(stderr), Some(exit_code), Some(duration_ms));
+                            anyhow::bail!("Postgres backup failed for {}", cfg.name);
+                        }
                     }
                     Err(e) => {
-                        error!("Error executing pg_dump for {}: {:?}", cfg.name, e);
+                        logger.log("error", format!("Error executing pg_dump for {}: {:?}", cfg.name, e));
+                        logger.log_command("pg_dump", Some(e.to_string()), Some(-1), Some(duration_ms));
                         return Err(e.into());
                     }
                 }
-                info!("Backup finished for database {}", cfg.name);
+                logger.log("info", format!("Backup finished for database {}", cfg.name));
                 Ok(file_path)
             }
 
             PostgresDumpFormat::Fd => {
-                info!("Running FD backup for {}", cfg.name);
+                logger.log("info", format!("Running FD backup for {}", cfg.name));
+
                 let dump_dir = backup_dir.join(format!("{}_dir", cfg.generated_id));
                 let tar_file = backup_dir.join(format!("{}.tar.gz", cfg.generated_id));
 
                 if let Err(e) = std::fs::create_dir_all(&dump_dir) {
-                    error!(
-                        "Failed to create dump directory {:?} for {}: {:?}",
-                        dump_dir, cfg.name, e
-                    );
+                    logger.log("error", format!("Failed to create dump directory {:?} for {}: {:?}", dump_dir, cfg.name, e));
                     return Err(e.into());
                 }
 
@@ -83,59 +91,58 @@ pub async fn run(
                     "postgresql://{}:{}@{}:{}/{}",
                     cfg.username, cfg.password, cfg.host, cfg.port, cfg.database
                 );
+                let cmd_label = format!("pg_dump -Fd {}", url);
 
-                let status = Command::new(&pg_dump)
-                    .arg("--dbname")
-                    .arg(&url)
+                let start = Instant::now();
+                let output = Command::new(&pg_dump)
+                    .arg("--dbname").arg(&url)
                     .arg("-Fd")
-                    .arg("-j")
-                    .arg("4")
-                    .arg("-f")
-                    .arg(&dump_dir)
+                    .arg("-j").arg("4")
+                    .arg("-f").arg(&dump_dir)
                     .arg("-v")
-                    .status();
+                    .output();
+                let duration_ms = start.elapsed().as_millis() as f64;
 
-                match status {
-                    Ok(s) if s.success() => {
-                        info!("FD backup pg_dump completed successfully for {}", cfg.name)
-                    }
-                    Ok(s) => {
-                        error!(
-                            "FD backup pg_dump failed with status {:?} for {}",
-                            s, cfg.name
-                        );
-                        anyhow::bail!("Postgres FD backup failed for {}", cfg.name);
+                match output {
+                    Ok(o) => {
+                        let stderr = String::from_utf8_lossy(&o.stderr).to_string();
+                        let exit_code = o.status.code().unwrap_or(-1);
+                        if o.status.success() {
+                            logger.log("info", format!("FD backup pg_dump completed successfully for {}", cfg.name));
+                            logger.log_command(cmd_label, if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+                        } else {
+                            logger.log("error", format!("FD backup pg_dump failed with status {:?} for {}", o.status, cfg.name));
+                            logger.log_command(cmd_label, Some(stderr), Some(exit_code), Some(duration_ms));
+                            anyhow::bail!("Postgres FD backup failed for {}", cfg.name);
+                        }
                     }
                     Err(e) => {
-                        error!("Error executing pg_dump for {}: {:?}", cfg.name, e);
+                        logger.log("error", format!("Error executing pg_dump for {}: {:?}", cfg.name, e));
+                        logger.log_command(cmd_label, Some(e.to_string()), Some(-1), Some(duration_ms));
                         return Err(e.into());
                     }
                 }
 
                 match std::fs::File::create(&tar_file) {
                     Ok(tar_gz) => {
-                        let enc =
-                            flate2::write::GzEncoder::new(tar_gz, flate2::Compression::default());
+                        let enc = flate2::write::GzEncoder::new(tar_gz, flate2::Compression::default());
                         let mut tar = tar::Builder::new(enc);
                         if let Err(e) = tar.append_dir_all(".", &dump_dir) {
-                            error!("Failed to append dump_dir to tar for {}: {:?}", cfg.name, e);
+                            logger.log("error", format!("Failed to append dump_dir to tar for {}: {:?}", cfg.name, e));
                             return Err(e.into());
                         }
                         if let Err(e) = tar.finish() {
-                            error!("Failed to finish tar archive for {}: {:?}", cfg.name, e);
+                            logger.log("error", format!("Failed to finish tar archive for {}: {:?}",  cfg.name, e));
                             return Err(e.into());
                         }
-                        info!("FD backup archive created at {:?}", tar_file);
+                        logger.log("info", format!("FD backup archive created at {:?}", tar_file));
                     }
                     Err(e) => {
-                        error!(
-                            "Failed to create tar.gz file {:?} for {}: {:?}",
-                            tar_file, cfg.name, e
-                        );
+                        logger.log("error", format!("Failed to create tar.gz file {:?} for {}: {:?}", tar_file, cfg.name, e));
                         return Err(e.into());
                     }
                 }
-                info!("Backup finished for database {}", cfg.name);
+                logger.log("info", format!("Backup finished for database {}", cfg.name));
                 Ok(tar_file)
             }
         }

src/domain/postgres/database.rs

@@ -1,13 +1,11 @@
 use anyhow::Result;
 use async_trait::async_trait;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
-use super::{
-    backup,
-    format::PostgresDumpFormat,
-    ping, restore,
-};
+use super::{backup, format::PostgresDumpFormat, ping, restore};
 use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use crate::utils::locks::{DbOpLock, FileLock};
 
@@ -35,16 +33,16 @@ impl Database for PostgresDatabase {
         ping::run(self.cfg.clone()).await
     }
 
-    async fn backup(&self, dir: &Path) -> Result<PathBuf> {
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
-        let res = backup::run(self.cfg.clone(), self.format, dir.to_path_buf()).await;
+        let res = backup::run(self.cfg.clone(), self.format, dir.to_path_buf(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }
 
-    async fn restore(&self, file: &Path) -> Result<()> {
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
-        let res = restore::run(self.cfg.clone(), self.format, file.to_path_buf()).await;
+        let res = restore::run(self.cfg.clone(), self.format, file.to_path_buf(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }

src/domain/postgres/format.rs

@@ -2,4 +2,4 @@
 pub enum PostgresDumpFormat {
     Fc,
     Fd,
-}
+}

src/domain/postgres/mod.rs

@@ -1,8 +1,8 @@
 pub mod backup;
-pub mod database;
-mod restore;
 mod connection;
+pub mod database;
 mod format;
 mod ping;
+mod restore;
 
-pub use connection::{detect_format_from_size, detect_format_from_file};
+pub use connection::{detect_format_from_file, detect_format_from_size};

src/domain/postgres/ping.rs

@@ -1,8 +1,6 @@
 use super::connection::connect;
 use crate::services::config::DatabaseConfig;
 
-pub async fn run(
-    cfg: DatabaseConfig,
-) -> anyhow::Result<bool> {
+pub async fn run(cfg: DatabaseConfig) -> anyhow::Result<bool> {
     Ok(connect(&cfg).await.is_ok())
-}
+}

src/domain/postgres/restore.rs

@@ -1,93 +1,107 @@
 use anyhow::Result;
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
 use super::connection::{select_pg_path, server_version, terminate_connections};
 use super::format::PostgresDumpFormat;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 
 pub async fn run(
     cfg: DatabaseConfig,
     format: PostgresDumpFormat,
     restore_file: PathBuf,
+    logger: Arc<JobLogger>,
 ) -> Result<()> {
     tokio::task::spawn_blocking(move || -> Result<()> {
-        debug!("Starting restore for database {}", cfg.name);
+        logger.log("info", format!("Starting restore for database {}", cfg.name));
 
         let version = match futures::executor::block_on(server_version(&cfg)) {
             Ok(v) => {
-                debug!("Postgres version detected: {}", v);
+                logger.log("debug", format!("Postgres version detected: {}", v));
                 v
             }
             Err(e) => {
-                error!("Failed to get server version for {}: {:?}", cfg.name, e);
+                logger.log("error", format!("Failed to get server version for {}: {:?}", cfg.name, e));
                 return Err(e.into());
             }
         };
 
         let pg_restore = select_pg_path(&version).join("pg_restore");
-        debug!("Using pg_restore at {:?}", pg_restore);
+
+        logger.log("debug", format!("Using pg_restore at {:?}", pg_restore));
 
         if let Err(e) = futures::executor::block_on(terminate_connections(&cfg)) {
-            error!("Failed to terminate connections for {}: {:?}", cfg.name, e);
+            logger.log("error", format!("Failed to terminate connections for {}: {:?}", cfg.name, e));
             return Err(e.into());
         }
-        info!("Connections terminated for database {}", cfg.name);
+        logger.log("info", format!("Connections terminated for database {}", cfg.name));
 
         let url = format!(
-            "postgresql://{}:{}@{}:{}/postgres",
-            cfg.username, cfg.password, cfg.host, cfg.port
+            "postgresql://{}:{}@{}:{}/{}",
+            cfg.username, cfg.password, cfg.host, cfg.port, cfg.database
         );
 
-        debug!("Restore URL: {}", url);
-
         match format {
             PostgresDumpFormat::Fc => {
-                info!("Running FC restore for {}", cfg.name);
-                let status = Command::new(&pg_restore)
+                logger.log("info", format!("Running FC restore for {}", cfg.name));
+                let start = Instant::now();
+                let output = Command::new(&pg_restore)
                     .arg("--no-owner")
                     .arg("--no-privileges")
                     .arg("--clean")
                     .arg("--if-exists")
-                    .arg("--create")
+                    // .arg("--create")
                     .arg("--dbname")
                     .arg(&url)
                     .arg("-v")
                     .arg(&restore_file)
                     .env("PGPASSWORD", &cfg.password)
-                    .status();
+                    .output();
 
-                match status {
-                    Ok(s) if s.success() => {
-                        info!("FC restore completed successfully for {}", cfg.name)
-                    }
-                    Ok(s) => {
-                        error!("FC restore failed with status {:?} for {}", s, cfg.name);
-                        anyhow::bail!("Postgres restore failed for {}", cfg.name);
+                let duration_ms = start.elapsed().as_millis() as f64;
+
+                match output {
+                    Ok(o) => {
+                        let stderr = String::from_utf8_lossy(&o.stderr).to_string();
+                        let stdout = String::from_utf8_lossy(&o.stdout).to_string();
+                        let combined = format!("{}{}", stdout, stderr);
+                        let exit_code = o.status.code().unwrap_or(-1);
+
+                        if o.status.success() {
+                            logger.log_command("pg_restore", if combined.is_empty() { None } else { Some(combined) }, Some(0), Some(duration_ms));
+                            logger.log("info", format!("FC restore completed successfully for {}", cfg.name))
+                        } else {
+                            logger.log_command("pg_restore", if combined.is_empty() { None } else { Some(combined) }, Some(exit_code), Some(duration_ms));
+                            logger.log("error", format!("FC restore failed with status {:?} for {}", o.status, cfg.name));
+                            anyhow::bail!("Postgres restore failed for {}", cfg.name);
+                        }
                     }
                     Err(e) => {
-                        error!("Error executing pg_restore for {}: {:?}", cfg.name, e);
+                        logger.log_command("pg_restore", Some(e.to_string()), Some(-1), Some(duration_ms));
+                        logger.log("error", format!("Error executing pg_restore for {}: {:?}", cfg.name, e));
                         return Err(e.into());
                     }
                 }
             }
 
             PostgresDumpFormat::Fd => {
-                info!("Running FD restore for {}", cfg.name);
+                logger.log("info", format!("Running FD restore for {}", cfg.name));
 
                 let tar_gz = match std::fs::File::open(&restore_file) {
                     Ok(f) => f,
                     Err(e) => {
-                        error!(
+                        logger.log("error", format!(
                             "Failed to open restore file {:?} for {}: {:?}",
                             restore_file, cfg.name, e
-                        );
+                        ));
                         return Err(e.into());
                     }
                 };
 
-                info!("tar_gz {:?}", tar_gz);
+                logger.log("info", format!("tar_gz {:?}", tar_gz));
 
                 let dec = flate2::read::GzDecoder::new(tar_gz);
                 let mut archive = tar::Archive::new(dec);
@@ -95,31 +109,31 @@ pub async fn run(
                 let tmp_dir = match tempfile::TempDir::new() {
                     Ok(d) => d,
                     Err(e) => {
-                        error!(
+                        logger.log("error", format!(
                             "Failed to create temporary directory for FD restore of {}: {:?}",
                             cfg.name, e
-                        );
+                        ));
                         return Err(e.into());
                     }
                 };
 
                 if let Err(e) = archive.unpack(tmp_dir.path()) {
-                    error!("Failed to unpack FD archive for {}: {:?}", cfg.name, e);
+                    logger.log("error", format!("Failed to unpack FD archive for {}: {:?}", cfg.name, e));
                     return Err(e.into());
                 }
 
-                debug!("Listing contents of temp dir: {}", tmp_dir.path().display());
+                logger.log("debug", format!("Listing contents of temp dir: {}", tmp_dir.path().display()));
 
                 for entry in std::fs::read_dir(tmp_dir.path())? {
                     if let Ok(entry) = entry {
                         let path = entry.path();
                         let file_type = entry.file_type()?;
-                        debug!(
+                        logger.log("debug", format!(
                             " - {} | is_dir: {} | is_file: {}",
                             path.display(),
                             file_type.is_dir(),
                             file_type.is_file()
-                        );
+                        ));
                     }
                 }
 
@@ -133,12 +147,13 @@ pub async fn run(
                         .ok_or_else(|| anyhow::anyhow!("Invalid FD archive: toc.dat not found"))?
                 };
 
-                let status = Command::new(&pg_restore)
+                let start = Instant::now();
+                let output = Command::new(&pg_restore)
                     .arg("--no-owner")
                     .arg("--no-privileges")
                     .arg("--clean")
                     .arg("--if-exists")
-                    .arg("--create")
+                    // .arg("--create")
                     .arg("--dbname")
                     .arg(&url)
                     .arg("-v")
@@ -146,25 +161,36 @@ pub async fn run(
                     .arg("4")
                     .arg(dump_dir)
                     .env("PGPASSWORD", &cfg.password)
-                    .status();
+                    .output();
 
-                match status {
-                    Ok(s) if s.success() => {
-                        info!("FD restore completed successfully for {}", cfg.name)
-                    }
-                    Ok(s) => {
-                        error!("FD restore failed with status {:?} for {}", s, cfg.name);
-                        anyhow::bail!("Postgres FD restore failed for {}", cfg.name);
+                let duration_ms = start.elapsed().as_millis() as f64;
+
+                match output {
+                    Ok(o) => {
+                        let stderr = String::from_utf8_lossy(&o.stderr).to_string();
+                        let stdout = String::from_utf8_lossy(&o.stdout).to_string();
+                        let combined = format!("{}{}", stdout, stderr);
+                        let exit_code = o.status.code().unwrap_or(-1);
+
+                        if o.status.success() {
+                            logger.log_command("pg_restore", if combined.is_empty() { None } else { Some(combined) }, Some(0), Some(duration_ms));
+                            logger.log("info", format!("FD restore completed successfully for {}", cfg.name))
+                        } else {
+                            logger.log_command("pg_restore", if combined.is_empty() { None } else { Some(combined) }, Some(exit_code), Some(duration_ms));
+                            logger.log("error", format!("FD restore failed with status {:?} for {}", o.status, cfg.name));
+                            anyhow::bail!("Postgres FD restore failed for {}", cfg.name);
+                        }
                     }
                     Err(e) => {
-                        error!("Error executing pg_restore for {}: {:?}", cfg.name, e);
+                        logger.log_command("pg_restore", Some(e.to_string()), Some(-1), Some(duration_ms));
+                        logger.log("error", format!("Error executing pg_restore for {}: {:?}", cfg.name, e));
                         return Err(e.into());
                     }
                 }
             }
         }
 
-        info!("Restore finished for database {}", cfg.name);
+        logger.log("info", format!("Restore finished for database {}", cfg.name));
 
         Ok(())
     })

src/domain/redis/backup.rs

@@ -0,0 +1,96 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(
+    cfg: DatabaseConfig,
+    backup_dir: PathBuf,
+    file_extension: &'static str,
+    logger: Arc<JobLogger>,
+) -> Result<PathBuf> {
+    tokio::task::spawn_blocking(move || -> Result<PathBuf> {
+        logger.log(
+            "info",
+            format!("Starting Redis backup for database {}", cfg.name),
+        );
+
+        let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
+
+        let mut cmd = Command::new("redis-cli");
+        cmd.arg("-h")
+            .arg(&cfg.host)
+            .arg("-p")
+            .arg(cfg.port.to_string());
+
+        if !cfg.username.is_empty() {
+            cmd.arg("--user").arg(&cfg.username);
+        }
+        if !cfg.password.is_empty() {
+            cmd.arg("-a").arg(&cfg.password);
+        }
+        cmd.arg("--rdb").arg(&file_path);
+
+        logger.log("info", format!("Running redis-cli --rdb for {}", cfg.name));
+
+        let start = Instant::now();
+        let output = cmd.output().context("Redis backup command failed")?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+
+        if !output.status.success() {
+            if stderr.contains("NOAUTH") {
+                logger.log(
+                    "error",
+                    format!(
+                        "Redis backup failed for {}: Authentication required (NOAUTH)",
+                        cfg.name
+                    ),
+                );
+                logger.log_command(
+                    "redis-cli",
+                    Some("Authentication required (NOAUTH)".into()),
+                    Some(exit_code),
+                    Some(duration_ms),
+                );
+                anyhow::bail!(
+                    "Redis backup failed for {}: Authentication required",
+                    cfg.name
+                );
+            } else {
+                logger.log(
+                    "error",
+                    format!("Redis backup failed for {}: {}", cfg.name, stderr),
+                );
+                logger.log_command(
+                    "redis-cli",
+                    Some(stderr.to_string()),
+                    Some(exit_code),
+                    Some(duration_ms),
+                );
+                anyhow::bail!("Redis backup failed for {}: {}", cfg.name, stderr);
+            }
+        }
+
+        logger.log_command(
+            "redis-cli",
+            if stdout.is_empty() {
+                None
+            } else {
+                Some(stdout.to_string())
+            },
+            Some(0),
+            Some(duration_ms),
+        );
+        logger.log("info", format!("Redis backup completed for {}", cfg.name));
+
+        Ok(file_path)
+    })
+    .await?
+}

src/domain/redis/database.rs

@@ -0,0 +1,42 @@
+use anyhow::{Result, bail};
+use async_trait::async_trait;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use crate::domain::factory::Database;
+use crate::domain::redis::{backup, ping};
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use crate::utils::locks::{DbOpLock, FileLock};
+
+pub struct RedisDatabase {
+    cfg: DatabaseConfig,
+}
+
+impl RedisDatabase {
+    pub fn new(cfg: DatabaseConfig) -> Self {
+        Self { cfg }
+    }
+}
+
+#[async_trait]
+impl Database for RedisDatabase {
+    fn file_extension(&self) -> &'static str {
+        ".rdb"
+    }
+
+    async fn ping(&self) -> Result<bool> {
+        ping::run(self.cfg.clone()).await
+    }
+
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
+        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.file_extension(), logger).await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+
+    async fn restore(&self, _file: &Path, _logger: Arc<JobLogger>) -> Result<()> {
+        bail!("Restore not supported for Redis databases")
+    }
+}

src/domain/redis/mod.rs

@@ -0,0 +1,3 @@
+mod backup;
+pub mod database;
+mod ping;

src/domain/redis/ping.rs

@@ -0,0 +1,52 @@
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use tokio::process::Command;
+use tokio::time::{Duration, timeout};
+use tracing::{debug, error, info};
+
+pub async fn run(cfg: DatabaseConfig) -> Result<bool> {
+    let mut cmd = Command::new("redis-cli");
+    cmd.arg("-h")
+        .arg(&cfg.host)
+        .arg("-p")
+        .arg(cfg.port.to_string());
+
+    if !cfg.username.is_empty() {
+        cmd.arg("--user").arg(&cfg.username);
+    }
+
+    if !cfg.password.is_empty() {
+        cmd.arg("-a").arg(&cfg.password);
+    }
+
+    cmd.arg("PING");
+
+    debug!("Command Ping Redis: {:?}", cmd);
+
+    let result = timeout(Duration::from_secs(10), cmd.output()).await;
+
+    match result {
+        Ok(output) => {
+            let output = output.context("Failed to execute redis-cli")?;
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            
+
+            if stderr.contains("NOAUTH") {
+                error!("Redis authentication failed (NOAUTH required)");
+                return Ok(false);
+            }
+
+            if !output.status.success() {
+                error!("Redis command failed with status: {:?}", output.status);
+                return Ok(false);
+            }
+
+            Ok(stdout.contains("PONG"))
+        }
+        Err(_) => {
+            info!("Timeout connecting to Redis at {}:{}", cfg.host, cfg.port);
+            Ok(false)
+        }
+    }
+}

src/domain/sqlite/backup.rs

@@ -1,16 +1,19 @@
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
 pub async fn run(
     cfg: DatabaseConfig,
     backup_dir: PathBuf,
     file_extension: &'static str,
+    logger: Arc<JobLogger>,
 ) -> Result<PathBuf> {
     tokio::task::spawn_blocking(move || -> Result<PathBuf> {
-        debug!("Starting SQLite backup for database {}", cfg.name);
+        logger.log("info", format!("Starting SQLite backup for database {}", cfg.name));
 
         let db_path_str = if cfg.path.is_empty() {
             anyhow::bail!("Database path not configured");
@@ -19,27 +22,36 @@ pub async fn run(
         };
 
         let db_path = PathBuf::from(db_path_str);
+        logger.log("info", format!("Database path: {}", db_path.display()));
 
         if !db_path.exists() {
+            logger.log("error", format!("SQLite database file not found: {}", db_path.display()));
             anyhow::bail!("SQLite database file not found: {}", db_path.display());
         }
 
         let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
 
+        logger.log("info", format!("Running sqlite3 backup for {}", cfg.name));
+
+        let start = Instant::now();
         let output = Command::new("sqlite3")
             .arg(db_path.as_os_str())
             .arg(format!(".backup '{}'", file_path.display()))
             .output()
             .context("SQLite backup command failed to start")?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
 
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            error!("SQLite backup failed for {}: {}", cfg.name, stderr);
+            let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+            logger.log("error", format!("SQLite backup failed for {}: {}", cfg.name, stderr));
+            logger.log_command("sqlite3", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
             anyhow::bail!("SQLite backup failed for {}: {}", cfg.name, stderr);
         }
 
-        info!("SQLite backup completed for {}", cfg.name);
+        logger.log_command("sqlite3", None, Some(0), Some(duration_ms));
+        logger.log("info", format!("SQLite backup completed for {}", cfg.name));
         Ok(file_path)
     })
-        .await?
-}
+    .await?
+}

src/domain/sqlite/database.rs

@@ -1,9 +1,11 @@
 use anyhow::Result;
 use async_trait::async_trait;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use super::{backup, ping, restore};
 use crate::domain::factory::Database;
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use crate::utils::locks::{DbOpLock, FileLock};
 
@@ -27,16 +29,15 @@ impl Database for SqliteDatabase {
         ping::run(self.cfg.clone()).await
     }
 
-    async fn backup(&self, dir: &Path) -> Result<PathBuf> {
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
-        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.file_extension()).await;
+        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.file_extension(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }
-
-    async fn restore(&self, file: &Path) -> Result<()> {
+    async fn restore(&self, file: &Path, logger: Arc<JobLogger>) -> Result<()> {
         FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
-        let res = restore::run(self.cfg.clone(), file.to_path_buf()).await;
+        let res = restore::run(self.cfg.clone(), file.to_path_buf(), logger).await;
         FileLock::release(&self.cfg.generated_id).await?;
         res
     }

src/domain/sqlite/mod.rs

@@ -1,4 +1,4 @@
 mod backup;
-mod restore;
+pub mod database;
 mod ping;
-pub mod database;
+mod restore;

src/domain/sqlite/restore.rs

@@ -1,12 +1,14 @@
+use crate::services::backup::logger::JobLogger;
 use crate::services::config::DatabaseConfig;
 use anyhow::{Context, Result};
 use std::path::PathBuf;
 use std::process::Command;
-use tracing::{debug, error, info};
+use std::sync::Arc;
+use std::time::Instant;
 
-pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
+pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf, logger: Arc<JobLogger>) -> Result<()> {
     tokio::task::spawn_blocking(move || -> Result<()> {
-        debug!("Starting SQLite restore for database {}", cfg.name);
+        logger.log("debug", format!("Starting SQLite restore for database {}", cfg.name));
 
         let db_path_str = if cfg.path.is_empty() {
             anyhow::bail!("Database path not configured");
@@ -25,19 +27,25 @@ pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
                 .with_context(|| format!("Failed to remove existing DB {}", db_path.display()))?;
         }
 
+        let start = Instant::now();
         let output = Command::new("sqlite3")
             .arg(db_path.as_os_str())
             .arg(format!(".restore '{}'", restore_file.display()))
             .output()
             .with_context(|| format!("Failed to run sqlite3 restore for {}", cfg.name))?;
 
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+        let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+
         if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            error!("SQLite restore failed for {}: {}", cfg.name, stderr);
+            logger.log_command("sqlite3", Some(stderr.clone()), Some(exit_code), Some(duration_ms));
+            logger.log("error", format!("SQLite restore failed for {}: {}", cfg.name, stderr));
             anyhow::bail!("SQLite restore failed for {}", cfg.name);
         }
 
-        info!("SQLite restore completed for {}", cfg.name);
+        logger.log_command("sqlite3", if stderr.is_empty() { None } else { Some(stderr) }, Some(0), Some(duration_ms));
+        logger.log("info", format!("SQLite restore completed for {}", cfg.name));
         Ok(())
     })
     .await?

src/domain/valkey/backup.rs

@@ -0,0 +1,96 @@
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Instant;
+
+pub async fn run(
+    cfg: DatabaseConfig,
+    backup_dir: PathBuf,
+    file_extension: &'static str,
+    logger: Arc<JobLogger>,
+) -> Result<PathBuf> {
+    tokio::task::spawn_blocking(move || -> Result<PathBuf> {
+        logger.log(
+            "info",
+            format!("Starting Valkey backup for database {}", cfg.name),
+        );
+
+        let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
+
+        let mut cmd = Command::new("valkey-cli");
+        cmd.arg("-h")
+            .arg(&cfg.host)
+            .arg("-p")
+            .arg(cfg.port.to_string());
+
+        if !cfg.username.is_empty() {
+            cmd.arg("--user").arg(&cfg.username);
+        }
+        if !cfg.password.is_empty() {
+            cmd.arg("-a").arg(&cfg.password);
+        }
+        cmd.arg("--rdb").arg(&file_path);
+
+        logger.log("info", format!("Running valkey-cli --rdb for {}", cfg.name));
+
+        let start = Instant::now();
+        let output = cmd.output().context("Valkey backup command failed")?;
+        let duration_ms = start.elapsed().as_millis() as f64;
+        let exit_code = output.status.code().unwrap_or(-1);
+
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+
+        if !output.status.success() {
+            if stderr.contains("NOAUTH") {
+                logger.log(
+                    "error",
+                    format!(
+                        "Valkey backup failed for {}: Authentication required (NOAUTH)",
+                        cfg.name
+                    ),
+                );
+                logger.log_command(
+                    "valkey-cli",
+                    Some("Authentication required (NOAUTH)".into()),
+                    Some(exit_code),
+                    Some(duration_ms),
+                );
+                anyhow::bail!(
+                    "Valkey backup failed for {}: Authentication required",
+                    cfg.name
+                );
+            } else {
+                logger.log(
+                    "error",
+                    format!("Valkey backup failed for {}: {}", cfg.name, stderr),
+                );
+                logger.log_command(
+                    "valkey-cli",
+                    Some(stderr.to_string()),
+                    Some(exit_code),
+                    Some(duration_ms),
+                );
+                anyhow::bail!("Valkey backup failed for {}: {}", cfg.name, stderr);
+            }
+        }
+
+        logger.log_command(
+            "valkey-cli",
+            if stdout.is_empty() {
+                None
+            } else {
+                Some(stdout.to_string())
+            },
+            Some(0),
+            Some(duration_ms),
+        );
+        logger.log("info", format!("Valkey backup completed for {}", cfg.name));
+
+        Ok(file_path)
+    })
+    .await?
+}

src/domain/valkey/database.rs

@@ -0,0 +1,42 @@
+use anyhow::{Result, bail};
+use async_trait::async_trait;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use crate::domain::factory::Database;
+use crate::domain::valkey::{backup, ping};
+use crate::services::backup::logger::JobLogger;
+use crate::services::config::DatabaseConfig;
+use crate::utils::locks::{DbOpLock, FileLock};
+
+pub struct ValkeyDatabase {
+    cfg: DatabaseConfig,
+}
+
+impl ValkeyDatabase {
+    pub fn new(cfg: DatabaseConfig) -> Self {
+        Self { cfg }
+    }
+}
+
+#[async_trait]
+impl Database for ValkeyDatabase {
+    fn file_extension(&self) -> &'static str {
+        ".rdb"
+    }
+
+    async fn ping(&self) -> Result<bool> {
+        ping::run(self.cfg.clone()).await
+    }
+
+    async fn backup(&self, dir: &Path, logger: Arc<JobLogger>) -> Result<PathBuf> {
+        FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
+        let res = backup::run(self.cfg.clone(), dir.to_path_buf(), self.file_extension(), logger).await;
+        FileLock::release(&self.cfg.generated_id).await?;
+        res
+    }
+
+    async fn restore(&self, _file: &Path, _logger: Arc<JobLogger>) -> Result<()> {
+        bail!("Restore not supported for Valkey databases")
+    }
+}

src/domain/valkey/mod.rs

@@ -0,0 +1,3 @@
+mod backup;
+pub mod database;
+mod ping;

src/domain/valkey/ping.rs

@@ -0,0 +1,51 @@
+use crate::services::config::DatabaseConfig;
+use anyhow::{Context, Result};
+use tokio::process::Command;
+use tokio::time::{Duration, timeout};
+use tracing::{debug, info, error};
+
+pub async fn run(cfg: DatabaseConfig) -> Result<bool> {
+    let mut cmd = Command::new("valkey-cli");
+    cmd.arg("-h")
+        .arg(&cfg.host)
+        .arg("-p")
+        .arg(cfg.port.to_string());
+
+    if !cfg.username.is_empty() {
+        cmd.arg("--user").arg(&cfg.username);
+    }
+
+    if !cfg.password.is_empty() {
+        cmd.arg("-a").arg(&cfg.password);
+    }
+
+    cmd.arg("PING");
+
+    debug!("Command Ping Valkey: {:?}", cmd);
+
+    let result = timeout(Duration::from_secs(10), cmd.output()).await;
+
+    match result {
+        Ok(output) => {
+            let output = output.context("Failed to execute valkey-cli")?;
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            
+            if stderr.contains("NOAUTH") {
+                error!("Valkey authentication failed (NOAUTH required)");
+                return Ok(false);
+            }
+
+            if !output.status.success() {
+                error!("Valkey command failed with status: {:?}", output.status);
+                return Ok(false);
+            }
+
+            Ok(stdout.contains("PONG"))
+        }
+        Err(_) => {
+            info!("Timeout connecting to Valkey at {}:{}", cfg.host, cfg.port);
+            Ok(false)
+        }
+    }
+}

src/main.rs

@@ -3,19 +3,18 @@ mod domain;
 mod services;
 mod settings;
 mod tasks;
-mod utils;
 #[cfg(test)]
 mod tests;
+mod utils;
 
 use crate::tasks::ping::ping_server;
 use crate::utils::locks::FileLock;
+use crate::utils::logging;
 use utils::redis_client;
 use utils::task_manager::scheduler;
-use crate::utils::logging;
 
 #[tokio::main]
 async fn main() {
-
     logging::init_logger();
 
     // Remove all locks on startup

src/services/api/client.rs

@@ -1,9 +1,9 @@
 #![allow(dead_code)]
 
+use crate::services::api::ApiError;
 use reqwest::{Client, Method};
 use serde::de::DeserializeOwned;
 use std::time::Duration;
-use crate::services::api::ApiError;
 
 #[derive(Clone, Debug)]
 pub struct ApiClient {
@@ -57,12 +57,7 @@ impl ApiClient {
     {
         let url = format!("{}{}", self.base_url, path);
 
-        let res = self
-            .http
-            .request(method, &url)
-            .json(body)
-            .send()
-            .await?;
+        let res = self.http.request(method, &url).json(body).send().await?;
 
         let status = res.status();
         let body_text = res.text().await.unwrap_or_default();

src/services/api/endpoints/agent/backup/mod.rs

@@ -2,6 +2,7 @@ pub mod upload;
 
 use crate::services::api::models::agent::backup::BackupResponse;
 use crate::services::api::{ApiClient, ApiError};
+use crate::services::backup::logger::JobLogEntry;
 use anyhow::Result;
 use reqwest::Method;
 use serde::Serialize;
@@ -21,9 +22,11 @@ pub struct BackupUpdateRequest {
     pub size: Option<u64>,
     #[serde(rename = "generatedId")]
     pub generated_id: String,
+    pub logs: Vec<JobLogEntry>,
+    #[serde(rename = "durationMs")]
+    pub duration_ms: f64,
 }
 
-
 impl ApiClient {
     pub async fn backup_create(
         &self,
@@ -50,12 +53,16 @@ impl ApiClient {
         status: impl Into<String>,
         file_size: impl Into<Option<u64>>,
         generated_id: impl Into<String>,
+        job_logs: Vec<JobLogEntry>,
+        duration_ms: f64,
     ) -> Result<Option<BackupResponse>, ApiError> {
         let body = BackupUpdateRequest {
             backup_id: backup_id.into(),
             status: status.into(),
             size: file_size.into(),
             generated_id: generated_id.into(),
+            logs: job_logs,
+            duration_ms: duration_ms,
         };
 
         let agent_id = agent_id.into();

src/services/api/endpoints/agent/backup/upload/init.rs

@@ -1,8 +1,8 @@
+use crate::services::api::models::agent::backup::BackupUploadResponse;
 use crate::services::api::{ApiClient, ApiError};
 use anyhow::Result;
 use reqwest::Method;
 use serde::Serialize;
-use crate::services::api::models::agent::backup::BackupUploadResponse;
 
 #[derive(Serialize)]
 pub struct InitUploadRequest {

src/services/api/endpoints/agent/backup/upload/mod.rs

@@ -1,2 +1,2 @@
 pub mod init;
-pub mod status;
+pub mod status;

src/services/api/endpoints/agent/mod.rs

@@ -1,3 +1,3 @@
-pub mod status;
 pub mod backup;
-pub mod restore;
+pub mod restore;
+pub mod status;

src/services/api/endpoints/agent/restore/mod.rs

@@ -3,12 +3,16 @@ use crate::services::api::{ApiClient, ApiError};
 use anyhow::Result;
 use reqwest::Method;
 use serde::Serialize;
+use crate::services::backup::logger::JobLogEntry;
 
 #[derive(Serialize)]
 pub struct ResultRestoreRequest {
     #[serde(rename = "generatedId")]
     pub generated_id: String,
     pub status: String,
+    pub logs: Vec<JobLogEntry>,
+    #[serde(rename = "durationMs")]
+    pub duration_ms: f64,
 }
 
 impl ApiClient {
@@ -17,10 +21,14 @@ impl ApiClient {
         agent_id: impl Into<String>,
         generated_id: impl Into<String>,
         status: impl Into<String>,
+        job_logs: Vec<JobLogEntry>,
+        duration_ms: f64,
     ) -> Result<Option<ResultRestoreResponse>, ApiError> {
         let body = ResultRestoreRequest {
             generated_id: generated_id.into(),
             status: status.into(),
+            logs: job_logs,
+            duration_ms,
         };
 
         let agent_id = agent_id.into();

src/services/api/endpoints/agent/status.rs

@@ -11,6 +11,8 @@ pub struct DatabasePayload<'a> {
     pub dbms: &'a str,
     #[serde(rename = "generatedId")]
     pub generated_id: &'a str,
+    #[serde(rename = "pingStatus")]
+    pub ping_status: bool
 }
 
 #[derive(Serialize)]
@@ -31,6 +33,7 @@ impl ApiClient {
         let agent_id = agent_id.into();
         let path = format!("/agent/{}/status", agent_id);
 
-        self.request_with_body(Method::POST, path.as_str(), &body).await
+        self.request_with_body(Method::POST, path.as_str(), &body)
+            .await
     }
-}
+}

src/services/api/endpoints/mod.rs

@@ -1,3 +1,3 @@
 pub mod agent;
 
-pub use agent::status;
+pub use agent::status;