Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update module to configure good job for background workers #10

Merged
merged 5 commits into from
Sep 30, 2023
Merged

Update module to configure good job for background workers #10

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f57bb06
Update module to configure good job for background workers
robbevp Sep 10, 2023
f6c83d7
Fix type
robbevp Sep 17, 2023
1ea5adc
Remove usage of default queue
robbevp Sep 17, 2023
efbe7d3
Use map instead of genList
robbevp Sep 17, 2023
d9f6eec
Update default queues
robbevp Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,28 @@ in
};

workers = mkOption {
description = "Amount of background workers that should be spawned.";
description = ''
A list of background workers with the queues they should use. Each element in the list will spawn a worker with the queues passed.

The available options for queues are:
* `*` (All queues)
* within_30_seconds
* within_5_minutes
* within_30_minutes
* whenever
Queues can be configured in different ways. Please check the good job docs for the possibilities: https://github.com/bensheldon/good_job#optimize-queues-threads-and-processes
'';
default = [ "within_30_seconds" "+within_30_seconds,within_5_minutes,within_30_minutes,whenever" "+within_30_seconds,within_5_minutes,within_30_minutes,whenever" "+within_30_seconds,within_5_minutes,within_30_minutes,whenever" ];
example = [ "within_30_seconds" "within_5_minutes:5;within_30_minutes:2;whenever:2" "+within_30_seconds,within_5_minutes,within_30_minutes,whenever" ];
type = types.listOf types.str;
};

delayedJobWorkers = mkOption {
description = ''
Amount of background workers using Delayed Job that should be spawned.

This option is deprecated and should only be used to finish working existing jobs.
'';
default = 4;
example = 8;
type = types.int;
Expand Down Expand Up @@ -159,9 +180,30 @@ in
ExecStart = "${gems}/bin/puma -C ${api}/config/puma.rb";
};
};
} // (builtins.foldl' (x: y: x // y) { } (builtins.genList
} // (builtins.foldl' (x: y: x // y) { } (lib.lists.imap0
(index: value: {
"accentor-worker-${toString (index)}" = {
after = [ "network.target" "accentor-api.service" "postgresql.service" ];
requires = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
environment = env // {
GOOD_JOB_QUEUES = value;
};
path = [ pkgs.ffmpeg gems gems.wrappedRuby ];
serviceConfig = {
EnvironmentFile = cfg.environmentFile;
Type = "simple";
User = "accentor";
Group = "accentor";
Restart = "on-failure";
WorkingDirectory = api;
ExecStart = "${gems}/bin/bundle exec good_job start";
};
};
})))
// (builtins.foldl' (x: y: x // y) { } (builtins.genList
(n: {
"accentor-worker${toString n}" = {
"accentor-worker-delayed${toString n}" = {
after = [ "network.target" "accentor-api.service" "postgresql.service" ];
requires = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
Expand All @@ -179,7 +221,7 @@ in
};

})
cfg.workers)) // lib.optionalAttrs cfg.rescanTimer.enable {
cfg.delayedJobWorkers)) // lib.optionalAttrs cfg.rescanTimer.enable {
accentor-rescan = {
description = "Accentor rescan";
restartIfChanged = false;
Expand Down Expand Up @@ -222,7 +264,7 @@ in
services.nginx.upstreams = mkIf (cfg.nginx != null) {
"accentor_api_server" = {
servers = {
"unix:///run/accentor/server.socket" = {};
"unix:///run/accentor/server.socket" = { };
};
};
};
Expand Down
Loading