Skip to content

Commit 857e17b

Browse files
authored
Resurrect job id changes (#36)
* Remove JobParameters requirement on JobQueueDriver * Use swift-jobs main branch
1 parent 27247ee commit 857e17b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
],
1111
dependencies: [
1212
// TODO: use a released version of swift-jobs
13-
.package(url: "https://github.com/hummingbird-project/swift-jobs.git", from: "1.0.0-beta.8"),
13+
.package(url: "https://github.com/hummingbird-project/swift-jobs.git", branch: "main"),
1414
.package(url: "https://github.com/hummingbird-project/postgres-migrations.git", from: "0.1.0"),
1515
.package(url: "https://github.com/vapor/postgres-nio.git", from: "1.25.0"),
1616
],

Sources/JobsPostgres/PostgresJobsQueue.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
273273
/// Register job
274274
/// - Parameters:
275275
/// - job: Job Definition
276-
public func registerJob<Parameters: JobParameters>(_ job: JobDefinition<Parameters>) {
276+
public func registerJob<Parameters>(_ job: JobDefinition<Parameters>) {
277277
self.jobRegistry.registerJob(job)
278278
}
279279

280280
/// Push Job onto queue
281281
/// - Returns: Identifier of queued job
282-
@discardableResult public func push<Parameters: JobParameters>(_ jobRequest: JobRequest<Parameters>, options: JobOptions) async throws -> JobID {
282+
@discardableResult public func push<Parameters>(_ jobRequest: JobRequest<Parameters>, options: JobOptions) async throws -> JobID {
283283
let jobID = JobID()
284284
try await self.client.withTransaction(logger: self.logger) { connection in
285285
try await self.add(jobID: jobID, jobRequest: jobRequest, queueName: configuration.queueName, connection: connection)
@@ -293,7 +293,7 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
293293
/// - id: Job instance ID
294294
/// - jobRequest: Job Request
295295
/// - options: Job retry options
296-
public func retry<Parameters: JobParameters>(_ id: JobID, jobRequest: JobRequest<Parameters>, options: JobRetryOptions) async throws {
296+
public func retry<Parameters>(_ id: JobID, jobRequest: JobRequest<Parameters>, options: JobRetryOptions) async throws {
297297
let buffer = try self.jobRegistry.encode(jobRequest: jobRequest)
298298
try await self.client.withTransaction(logger: self.logger) { connection in
299299
try await self.updateJob(id: id, buffer: buffer, connection: connection)

0 commit comments

Comments
 (0)