sync scheduler overhaul

configs/sync-scheduler.env.example

@@ -0,0 +1,2 @@
+DRY_RUN=true
+MANUAL_SYNC_PORT=9281

docker-compose-dev.yaml

@@ -39,11 +39,14 @@ services:
     depends_on:
       - website
 
-
   # --- Sync scheduler ---
   sync-scheduler:
     build: ./mirror-sync-scheduler
     container_name: mirror-sync-scheduler
+    env_file:
+      - configs/sync-scheduler.env
+    expose:
+      - 9281
     volumes:
       - "./mirror-sync-scheduler/storage:/storage"
       - "./mirror-sync-scheduler/configs:/mirror/configs:ro"
@@ -56,32 +59,32 @@ services:
     tty: true
 
   # --- Torrent handler ---
-#  torrent-handler:
-#    build: ./mirror-torrent-handler
-#    container_name: mirror-torrent-handler
-#    volumes:
-#      - "./mirror-torrent-handler/storage:/storage"
-#      - "./mirror-torrent-handler/configs:/mirror/configs:ro"
-#    networks:
-#      - mirror
-#    depends_on:
-#      - log-server
+  #  torrent-handler:
+  #    build: ./mirror-torrent-handler
+  #    container_name: mirror-torrent-handler
+  #    volumes:
+  #      - "./mirror-torrent-handler/storage:/storage"
+  #      - "./mirror-torrent-handler/configs:/mirror/configs:ro"
+  #    networks:
+  #      - mirror
+  #    depends_on:
+  #      - log-server
 
   # --- Map ---
-#  map:
-#    build: ./mirror-map
-#    container_name: mirror-map
-#    restart: unless-stopped
-#    ports:
-#      - "30302:8080"
-#    networks:
-#      - mirror
-#    volumes:
-#      - "./mirror-map/configs:/mirror/configs:ro"
-#      - "./mirror-map/GeoLite2City:/mirror/GeoLite2City"
-#    depends_on:
-#      - log-server
-#      - metrics
+  #  map:
+  #    build: ./mirror-map
+  #    container_name: mirror-map
+  #    restart: unless-stopped
+  #    ports:
+  #      - "30302:8080"
+  #    networks:
+  #      - mirror
+  #    volumes:
+  #      - "./mirror-map/configs:/mirror/configs:ro"
+  #      - "./mirror-map/GeoLite2City:/mirror/GeoLite2City"
+  #    depends_on:
+  #      - log-server
+  #      - metrics
 
   # --- Metrics engine ---
   metrics:

docker-compose-prod.yaml

@@ -57,12 +57,16 @@ services:
     depends_on:
       - log-server
       - metrics
-  
+
   # --- Sync scheduler ---
   sync-scheduler:
     build: ./mirror-sync-scheduler
     container_name: mirror-sync-scheduler
+    expose:
+      - 9281
     restart: unless-stopped
+    env_file:
+      - configs/sync-scheduler.env
     volumes:
       - "/storage:/storage"
       - "./configs:/mirror/configs:ro"
@@ -117,7 +121,7 @@ services:
       - mirror
     depends_on:
       - metrics
-  
+
   # --- Grafana ---
   grafana:
     image: grafana/grafana:latest
@@ -132,12 +136,10 @@ services:
     depends_on:
       - prometheus
 
-
 networks:
   mirror:
     external: true
 
-
 volumes:
   prometheus: {}
   grafana: {}

mirror-sync-scheduler/.clang-tidy

@@ -0,0 +1,3 @@
+InheritParentConfig: true
+Checks:
+    - -clang-analyzer-optin.cplusplus.UninitializedObject # spdlog causing issues

mirror-sync-scheduler/.gitignore

@@ -1,3 +1,4 @@
 .vscode
 build
-*.secret
+*.secret
+.idea

mirror-sync-scheduler/CMakeLists.txt

@@ -1,23 +1,16 @@
-cmake_minimum_required(VERSION 3.22)
-project(syncScheduler)
+cmake_minimum_required(VERSION 3.20...3.30)
+
+#find_program(CLANG_TIDY_EXE NAMES "clang-tidy-20" "clang-tidy" REQUIRED)
+#set(CLANG_TIDY_COMMAND ${CLANG_TIDY_EXE} --header-filter=${CMAKE_SOURCE_DIR}/include)
 
-add_executable(${PROJECT_NAME}
-    src/main.cpp
-    src/schedule.cpp
-    src/queue.cpp
-)
 
-include(FetchContent)
+set(CPPZMQ_BUILD_TESTS OFF CACHE INTERNAL "")
 
-FetchContent_Declare(json
-    GIT_REPOSITORY https://github.com/nlohmann/json
-    GIT_TAG v3.11.3
+project(syncScheduler
+    LANGUAGES CXX
 )
-FetchContent_MakeAvailable(json)
 
-add_subdirectory(lib/mirror-logging)
+include(cmake/fetch_deps.cmake)
+
+add_subdirectory(src)
 
-target_link_libraries(${PROJECT_NAME} 
-    PUBLIC mirror-logging
-    PRIVATE nlohmann_json::nlohmann_json
-)

mirror-sync-scheduler/Dockerfile

@@ -5,18 +5,17 @@
 FROM ubuntu:24.04 as builder
 RUN apt update && apt install -y g++ cmake libzmq3-dev ninja-build git
 WORKDIR /mirror
-COPY ./src /mirror/src
-COPY ./lib /mirror/lib
-COPY ./CMakeLists.txt /mirror/CMakeLists.txt
-RUN cmake -S/mirror -B/mirror/build -G Ninja
-RUN cmake --build /mirror/build --target clean
-RUN cmake --build /mirror/build --target all
+COPY src src
+COPY include include
+COPY cmake cmake
+COPY CMakeLists.txt CMakeLists.txt
+RUN cmake -B build -G Ninja
+RUN cmake --build build --target all
 
 # Run
 FROM ubuntu:24.04
-RUN apt update && apt install -y python3 curl wget
-RUN apt install -y libzmq3-dev rsync
+RUN apt update && apt install -y python3 curl wget libzmq3-dev rsync
 WORKDIR /mirror
-COPY --from=builder /mirror/build/syncScheduler .
-RUN chmod 744 syncScheduler
-ENTRYPOINT ["./syncScheduler"]
+COPY --from=builder /mirror/build/src/sync_scheduler .
+RUN chmod 744 sync_scheduler
+ENTRYPOINT ["./sync_scheduler"]

mirror-sync-scheduler/cmake/fetch_deps.cmake

@@ -0,0 +1,19 @@
+include(FetchContent)
+
+FetchContent_Declare(json
+    GIT_REPOSITORY https://github.com/nlohmann/json
+    GIT_TAG v3.11.3
+)
+FetchContent_MakeAvailable(json)
+
+FetchContent_Declare(spdlog
+    GIT_REPOSITORY https://github.com/gabime/spdlog
+    GIT_TAG v1.15.1
+)
+FetchContent_MakeAvailable(spdlog)
+
+FetchContent_Declare(cppzmq
+    GIT_REPOSITORY https://github.com/zeromq/cppzmq
+    GIT_TAG v4.10.0
+)
+FetchContent_MakeAvailable(cppzmq)