Correctly schedule jobs (#9)

Author: adborbas

.env.development

@@ -7,6 +7,11 @@ DATABASE_PASSWORD="test"
 DATABASE_DBNAME="postgres"
 DATABASE_PORT="5432"
 
+# Redis
+REDIS_HOSTNAME="127.0.0.1"
+REDIS_PASSWORD="test"
+REDIS_MAX_ACTIVE_CON="20"
+
 # Default user
 DEFAULT_USER_NAME="Test Test"
 DEFAULT_USER_EMAIL="[email protected]"

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
         run: swift test
 
   build-and-test-ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Swift on Ubuntu

.github/workflows/push.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Set up QEMU

Sources/Grodt/Application/configure.swift

@@ -1,6 +1,4 @@
 import Vapor
-import Fluent
-import FluentPostgresDriver
 import FluentSQLiteDriver
 
 public func configure(_ app: Application) async throws {
@@ -15,6 +13,7 @@ public func configure(_ app: Application) async throws {
             app.http.server.configuration.port = port
         }
         try app.databases.use(DatabaseConfigurationFactory.postgres(from: app.config.postgres), as: .psql)
+        try app.queues.use(.redis(from: app.config.redis))
     }
 
     try await routes(app)

Sources/Grodt/Application/routes.swift

@@ -77,9 +77,13 @@ func routes(_ app: Application) async throws {
         try routeBuilder.register(collection: investmentsController)
     }
 
-    
-    app.queues.schedule(PortfolioPerformanceUpdaterJob(performanceUpdater: portfolioPerformanceUpdater))
-        .daily()
-        .at(1, 0)
-    app.queues.add(LoggingJobEventDelegate(logger: app.logger))
+    if app.environment != .testing {
+        let portfolioUpdaterJob = PortfolioPerformanceUpdaterJob(performanceUpdater: portfolioPerformanceUpdater)
+        app.queues.schedule(portfolioUpdaterJob)
+            .daily()
+            .at(3, 0)
+        app.queues.add(LoggingJobEventDelegate(logger: app.logger))
+        try app.queues.startScheduledJobs()
+        try app.queues.startInProcessJobs()
+    }
 }

Sources/Grodt/Configuration/AppConfiguration.swift

@@ -20,6 +20,19 @@ struct AppConfiguration {
         fileprivate init() { }
     }
 
+    struct Redis {
+        @RequiredEnvironmentVariable(key: "REDIS_HOSTNAME")
+        var hostName: String
+        
+        @RequiredEnvironmentVariable(key: "REDIS_PASSWORD")
+        var password: String
+        
+        @RequiredEnvironmentVariable(key: "REDIS_MAX_ACTIVE_CON")
+        var maximumActiveConnections: Int
+                
+        fileprivate init() { }
+    }
+    
     struct PreconfiguredUser {
         @OptionalEnvironmentVariable(key: "DEFAULT_USER_NAME")
         var name: String?
@@ -33,6 +46,7 @@ struct AppConfiguration {
 
     private let app: Application
     let postgres = Postgres()
+    let redis = Redis()
 
     @OptionalEnvironmentVariable(key: "PORT")
     var port: Int?

Sources/Grodt/Configuration/Application.Queues.Provider+redis.swift

@@ -0,0 +1,13 @@
+import Vapor
+import QueuesRedisDriver
+
+extension Application.Queues.Provider {
+    static func redis(from configuration: AppConfiguration.Redis) throws -> Self {
+        let redisConfiguration = try RedisConfiguration(
+            hostname: configuration.hostName,
+            password: configuration.password,
+            pool: .init(maximumConnectionCount: .maximumActiveConnections(configuration.maximumActiveConnections))
+        )
+        return .redis(redisConfiguration)
+    }
+}

docker-compose.yml

@@ -7,3 +7,12 @@ services:
       - 5432:5432
     environment:
       POSTGRES_PASSWORD: "test"
+
+  redis:
+    image: redis:latest
+    restart: always
+    ports:
+      - "6379:6379"
+    command: ["redis-server", "--requirepass", "test"]
+    environment:
+      REDIS_PASSWORD: "test"