pgbus 0.24.0 → 0.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/app/controllers/pgbus/deploy_tasks_controller.rb +11 -1
- data/app/helpers/pgbus/deploy_tasks_helper.rb +20 -0
- data/app/models/pgbus/deploy_task.rb +23 -1
- data/app/models/pgbus/deploy_task_run.rb +47 -5
- data/app/views/pgbus/deploy_tasks/_tasks_table.html.erb +3 -0
- data/app/views/pgbus/deploy_tasks/show.html.erb +25 -2
- data/config/i18n-tasks.yml +1 -0
- data/config/locales/da.yml +18 -0
- data/config/locales/de.yml +18 -0
- data/config/locales/en.yml +18 -0
- data/config/locales/es.yml +18 -0
- data/config/locales/fi.yml +18 -0
- data/config/locales/fr.yml +18 -0
- data/config/locales/it.yml +18 -0
- data/config/locales/ja.yml +18 -0
- data/config/locales/nb.yml +18 -0
- data/config/locales/nl.yml +18 -0
- data/config/locales/pt.yml +18 -0
- data/config/locales/sv.yml +18 -0
- data/lib/generators/pgbus/add_deploy_task_run_outcomes_generator.rb +48 -0
- data/lib/generators/pgbus/templates/add_deploy_task_run_outcomes.rb.erb +12 -0
- data/lib/generators/pgbus/templates/add_deploy_tasks_tables.rb.erb +5 -0
- data/lib/generators/pgbus/templates/deploy_tasks.yml.erb +6 -0
- data/lib/generators/pgbus/templates/migration.rb.erb +5 -0
- data/lib/pgbus/active_job/adapter.rb +13 -0
- data/lib/pgbus/active_job/deploy_task_run_id.rb +53 -0
- data/lib/pgbus/active_job/executor.rb +57 -0
- data/lib/pgbus/deploy/dependencies.rb +115 -0
- data/lib/pgbus/deploy/runner.rb +103 -18
- data/lib/pgbus/deploy/schema.rb +65 -0
- data/lib/pgbus/deploy/task.rb +23 -5
- data/lib/pgbus/engine.rb +1 -0
- data/lib/pgbus/generators/migration_detector.rb +13 -3
- data/lib/pgbus/mcp/tools/deploy_tasks_tool.rb +1 -1
- data/lib/pgbus/version.rb +1 -1
- data/lib/pgbus/web/data_source/deploy_task_list.rb +39 -6
- data/lib/pgbus/web/deploy_task_state.rb +7 -5
- metadata +6 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1b3feabb297f44a982729733bf7c45e3dfa7aa0ce389e43bb6451b699636bf8f
|
|
4
|
+
data.tar.gz: 4729a4f127dee012b73d4d5c714bbab574ef134d83147be9d66741bb0ef556d3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0ba843ed880d64b2250d9c7bc122a3d78d4c4e5726d6a87408d91b703419585c93ff3c37e46bc65ad5c788bd7ea5c2542a22323cada6e9b9fefe81fc2c9ed223
|
|
7
|
+
data.tar.gz: 8bd1142c5aaa183cb3c1f6b27b66bbe6e69d8f988b3d08068dac6934d57eb48bff444da6b3fc04bb71a1e1224b377e15f60aad1e2206cd2a4026bb39adbd5c79
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
## [Unreleased]
|
|
2
2
|
|
|
3
|
+
### Added
|
|
4
|
+
|
|
5
|
+
- **Deploy tasks: `after:` makes a task wait until the tasks it names have completed, and every run records its outcome (issue #660).** `after:` takes a task key or a list of keys declared in the loaded configuration (any of `deploy_tasks_files`). The scheduler keeps such a task armed, and does not enqueue it, until each named task has a run with `completed_at` at its current version (any revision; an `every_deploy` dependency needs one on this revision). A rollover run and a Run now run both count, so a failed dependency that an operator fixes and runs again with Run now unblocks its dependents without a new deploy. A waiting task records no failure and no backoff, and fires on the first tick after its last dependency completes; the check is one query per tick, made only while an armed task has dependencies. At scheduler boot a task whose `after:` names an unknown key (`after: unknown task 'x'`), sits on a cycle (`after: cycle a → b → a`, a self-reference included), or names a task that is itself skipped (`after: 'x' is skipped`) is skipped with a warning. Run outcomes: `Deploy::Runner#enqueue` now creates the `pgbus_deploy_task_runs` row before the enqueue and passes its id in the job payload under `pgbus_deploy_task_run_id` (`Pgbus::ActiveJob::DeployTaskRunId`, included on `ActiveJob::Base` next to `BatchId`; an unmarked job's payload is unchanged), fills in `queue_name` and `msg_id` after it, and deletes the row when the enqueue fails. The executor stamps `completed_at` when `perform` returned having done its work without re-enqueuing the job (a `retry_on` attempt whose retry is queued, or a `discard_on` block that queues one, leaves it to the retry; a job that rescues inside `perform` and returns has completed) and `failed_at` when ActiveJob discarded the job without queuing a retry (`discard_on`, with or without a block, or a `retry_on` that gave up through its block, where one without a block re-raises and ends dead-lettered as before; `Pgbus::ActiveJob::DeployTaskRunId` marks the instance in ActiveJob's `run_after_discard_procs`, after the job's own `after_discard` procs, so a discarded dependency reads `failed` and its dependents keep waiting, issue #662), when the job is dead-lettered, discarded as a `:while_executing` duplicate, or its retry never left (dropped by its own concurrency limit, `on_conflict: :discard`, or aborted by a `before_enqueue` callback); a failed write is reported and never fails the job, and a job without the key pays one Hash lookup. An enqueue the job's own `on_conflict: :discard` / `:log` drops now counts as a failed enqueue (the run is deleted and the task re-armed with backoff). A run row without `queue_name` (its enqueue never finished) does not count as a run, so the version stays owed. The dispatcher's pruning keeps the newest completed run per task and version. Dashboard: a task's state says "Waiting for N dependencies to complete" and lists each one as `not run`, `running` or `failed`; the task page shows `after:` and an Outcome column in the run history; Run now on a waiting task is refused with a flash naming the dependencies (`DataSource#enqueue_deploy_task_now(id, ignore_dependencies: false)` returns `:blocked`) unless "Ignore dependencies" is ticked on the task page. `pgbus_deploy_tasks` (MCP) lists `dependencies` and `waiting_on`. New generator `pgbus:add_deploy_task_run_outcomes` adds `pgbus_deploy_task_runs.completed_at` / `failed_at`, `pgbus_deploy_tasks.dependencies` and an index on `(task_key, completed_at)`; `pgbus:update` queues it, and fresh `pgbus:install` / `pgbus:add_deploy_tasks` include the columns. Until it is migrated, a task with `after:` is skipped with a warning naming the generator and no outcome is written. **Upgrade note:** runs recorded before the migration have no outcome and satisfy nothing, so when an `after:` names a task whose only runs predate the upgrade, Run now that task once (or bump its version; an `every_deploy` dependency needs a run on the current revision, so only Run now helps). Delivery stays at-least-once: a scheduler that dies between claiming a task and enqueuing it leaves the task unarmed until the next scheduler boot re-arms it, and a run whose enqueue could not be recorded runs again after one, so deploy tasks must be idempotent. Refs #660.
|
|
6
|
+
|
|
3
7
|
## [0.24.0] - 2026-11-11
|
|
4
8
|
|
|
5
9
|
### Added
|
|
@@ -28,11 +28,21 @@ module Pgbus
|
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
def enqueue
|
|
31
|
-
|
|
31
|
+
case data_source.enqueue_deploy_task_now(params[:id], ignore_dependencies: params[:ignore_dependencies] == "1")
|
|
32
|
+
when :enqueued
|
|
32
33
|
redirect_to pgbus.deploy_tasks_path, notice: t("pgbus.deploy_tasks.enqueue.enqueued")
|
|
34
|
+
when :blocked
|
|
35
|
+
redirect_to pgbus.deploy_task_path(params[:id]), alert: t("pgbus.deploy_tasks.enqueue.blocked", tasks: waiting_on_keys)
|
|
33
36
|
else
|
|
34
37
|
redirect_to pgbus.deploy_tasks_path, alert: t("pgbus.deploy_tasks.enqueue.failed")
|
|
35
38
|
end
|
|
36
39
|
end
|
|
40
|
+
|
|
41
|
+
private
|
|
42
|
+
|
|
43
|
+
# The dependencies a refused Run now names: the task page's own reading.
|
|
44
|
+
def waiting_on_keys
|
|
45
|
+
Array(data_source.deploy_task(params[:id])&.dig(:waiting_on)).map { |dep| dep[:key] }.join(", ")
|
|
46
|
+
end
|
|
37
47
|
end
|
|
38
48
|
end
|
|
@@ -26,6 +26,26 @@ module Pgbus
|
|
|
26
26
|
safe_join([reason, " ", translate("pgbus.deploy_tasks.reasons.manual_html", **pgbus_reason_args(result.manual_args))])
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
+
# "Waiting on: widgets (running), gadgets (not run)" (issue #660).
|
|
30
|
+
def pgbus_deploy_waiting_on(waiting_on)
|
|
31
|
+
parts = waiting_on.map do |dep|
|
|
32
|
+
translate("pgbus.deploy_tasks.waiting_on.dependency_html",
|
|
33
|
+
key: dep[:key], state: t("pgbus.deploy_tasks.dependency_states.#{dep[:state]}"))
|
|
34
|
+
end
|
|
35
|
+
safe_join([t("pgbus.deploy_tasks.waiting_on.label"), " ", safe_join(parts, ", ")])
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
# A run's outcome: completed or failed with when, or none yet.
|
|
39
|
+
def pgbus_deploy_run_outcome(run)
|
|
40
|
+
if run[:completed_at]
|
|
41
|
+
translate("pgbus.deploy_tasks.outcomes.completed_html", ago: pgbus_time(run[:completed_at]))
|
|
42
|
+
elsif run[:failed_at]
|
|
43
|
+
translate("pgbus.deploy_tasks.outcomes.failed_html", ago: pgbus_time(run[:failed_at]))
|
|
44
|
+
else
|
|
45
|
+
t("pgbus.deploy_tasks.outcomes.none")
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
|
|
29
49
|
def pgbus_deploy_rollover_key(rollover)
|
|
30
50
|
return "unavailable" unless rollover
|
|
31
51
|
return "no_scheduler" unless rollover[:scheduler]
|
|
@@ -24,6 +24,7 @@ module Pgbus
|
|
|
24
24
|
# and never touches enabled; an arm already held keeps its armed_at and
|
|
25
25
|
# takes the new armed_for (a later bump supersedes an unfired one).
|
|
26
26
|
def self.sync_from_config!(tasks, revision:, now: Time.current)
|
|
27
|
+
refresh_dependencies_column!
|
|
27
28
|
transaction do
|
|
28
29
|
tasks.each { |task| sync_task!(task, revision: revision, now: now) }
|
|
29
30
|
static_tasks.where.not(key: tasks.map(&:key)).delete_all
|
|
@@ -39,6 +40,15 @@ module Pgbus
|
|
|
39
40
|
DeployTaskRun.last_rollover_for(task.key)&.revision != revision
|
|
40
41
|
end
|
|
41
42
|
|
|
43
|
+
# A process that loaded this model before pgbus:add_deploy_task_run_outcomes
|
|
44
|
+
# was migrated keeps the old column list: reload it once the column
|
|
45
|
+
# exists, so dependencies are read and written (issue #660).
|
|
46
|
+
def self.refresh_dependencies_column!
|
|
47
|
+
return if column_names.include?("dependencies") || !Deploy::Schema.outcomes?
|
|
48
|
+
|
|
49
|
+
reset_column_information
|
|
50
|
+
end
|
|
51
|
+
|
|
42
52
|
def self.sync_task!(task, revision:, now:)
|
|
43
53
|
record = find_or_initialize_by(key: task.key)
|
|
44
54
|
record.assign_attributes(
|
|
@@ -46,6 +56,9 @@ module Pgbus
|
|
|
46
56
|
queue_name: task.queue_name, priority: task.priority, version: task.version,
|
|
47
57
|
every_deploy: task.every_deploy, description: task.description, static: true
|
|
48
58
|
)
|
|
59
|
+
# The column cache too: a process booted before the migration keeps
|
|
60
|
+
# the old column list until it restarts.
|
|
61
|
+
record.dependencies = JSON.generate(task.dependencies) if Deploy::Schema.outcomes? && record.has_attribute?(:dependencies)
|
|
49
62
|
if owed?(task, revision)
|
|
50
63
|
record.armed_at ||= now
|
|
51
64
|
record.armed_for = task.armed_for(revision)
|
|
@@ -79,6 +92,14 @@ module Pgbus
|
|
|
79
92
|
!armed_at.nil?
|
|
80
93
|
end
|
|
81
94
|
|
|
95
|
+
# The after: keys; none before the outcomes migration or for a corrupt value.
|
|
96
|
+
def parsed_dependencies
|
|
97
|
+
value = has_attribute?(:dependencies) ? self[:dependencies] : nil
|
|
98
|
+
value.blank? ? [] : Array(JSON.parse(value))
|
|
99
|
+
rescue JSON::ParserError
|
|
100
|
+
[]
|
|
101
|
+
end
|
|
102
|
+
|
|
82
103
|
# For display: a corrupt value shows as no arguments.
|
|
83
104
|
def parsed_arguments
|
|
84
105
|
decoded_arguments
|
|
@@ -91,7 +112,8 @@ module Pgbus
|
|
|
91
112
|
def to_task
|
|
92
113
|
Deploy::Task.new(
|
|
93
114
|
key: key, class_name: class_name, command: command, version: version, every_deploy: every_deploy,
|
|
94
|
-
queue_name: queue_name, arguments: decoded_arguments, priority: priority, description: description
|
|
115
|
+
queue_name: queue_name, arguments: decoded_arguments, priority: priority, description: description,
|
|
116
|
+
dependencies: parsed_dependencies
|
|
95
117
|
)
|
|
96
118
|
end
|
|
97
119
|
|
|
@@ -4,6 +4,12 @@ module Pgbus
|
|
|
4
4
|
# One enqueue of a deploy task (issue #536): by the scheduler after a
|
|
5
5
|
# rollover, or by "Run now" on the dashboard. Rollover runs are what
|
|
6
6
|
# DeployTask.owed? reads; manual runs never satisfy an obligation.
|
|
7
|
+
#
|
|
8
|
+
# The row is created before its job is enqueued and carries the job's
|
|
9
|
+
# queue_name once the enqueue went through (issue #660), so a row without
|
|
10
|
+
# one (a crash between the two) counts as no run. The executor stamps
|
|
11
|
+
# completed_at or failed_at; a completed run at a task's current version is
|
|
12
|
+
# what an after: dependency waits for (Deploy::Dependencies).
|
|
7
13
|
class DeployTaskRun < BusRecord
|
|
8
14
|
self.table_name = "pgbus_deploy_task_runs"
|
|
9
15
|
|
|
@@ -13,7 +19,9 @@ module Pgbus
|
|
|
13
19
|
validates :task_key, :version, :triggered_by, :run_at, presence: true
|
|
14
20
|
|
|
15
21
|
scope :for_task, ->(key) { where(task_key: key) }
|
|
16
|
-
scope :
|
|
22
|
+
scope :enqueued, -> { where.not(queue_name: nil) }
|
|
23
|
+
scope :completed, -> { where.not(completed_at: nil) }
|
|
24
|
+
scope :rollover, -> { enqueued.where(triggered_by: ROLLOVER) }
|
|
17
25
|
scope :manual, -> { where(triggered_by: MANUAL) }
|
|
18
26
|
scope :recent, ->(limit = 25) { order(id: :desc).limit(limit) }
|
|
19
27
|
scope :older_than, ->(time) { where(run_at: ...time) }
|
|
@@ -22,8 +30,13 @@ module Pgbus
|
|
|
22
30
|
# rollover run per (task_key, version). That run is what marks a version
|
|
23
31
|
# done (DeployTask.owed?); pruning it would re-arm the task on the next
|
|
24
32
|
# scheduler boot and run it again.
|
|
33
|
+
# The newest completed run per (task_key, version) is kept too: it is
|
|
34
|
+
# what satisfies an after: dependency on that version.
|
|
25
35
|
def self.prunable_before(time)
|
|
26
|
-
older_than(time).where.not(id: rollover.group(:task_key, :version).select("MAX(id)"))
|
|
36
|
+
scope = older_than(time).where.not(id: rollover.group(:task_key, :version).select("MAX(id)"))
|
|
37
|
+
return scope unless Deploy::Schema.outcomes?
|
|
38
|
+
|
|
39
|
+
scope.where.not(id: completed.group(:task_key, :version).select("MAX(id)"))
|
|
27
40
|
end
|
|
28
41
|
|
|
29
42
|
def self.last_rollover_for(key)
|
|
@@ -33,13 +46,42 @@ module Pgbus
|
|
|
33
46
|
# The newest run per (task_key, triggered_by) for +keys+: the dashboard's
|
|
34
47
|
# "last rollover run" and "last manual run" columns, in one query.
|
|
35
48
|
def self.latest_for(keys)
|
|
36
|
-
where(task_key: keys)
|
|
37
|
-
|
|
38
|
-
|
|
49
|
+
enqueued.where(task_key: keys)
|
|
50
|
+
.select("DISTINCT ON (task_key, triggered_by) #{quoted_table_name}.*")
|
|
51
|
+
.order(:task_key, :triggered_by, id: :desc)
|
|
39
52
|
end
|
|
40
53
|
|
|
41
54
|
def self.rollover_run_for?(key, version)
|
|
42
55
|
rollover.for_task(key).exists?(version: version.to_s)
|
|
43
56
|
end
|
|
57
|
+
|
|
58
|
+
# The executor's outcome writes: true when this call stamped the run.
|
|
59
|
+
def self.mark_completed!(id, now: Time.current) # rubocop:disable Naming/PredicateMethod -- reports whether it stamped
|
|
60
|
+
where(id: id, completed_at: nil).update_all(completed_at: now) == 1
|
|
61
|
+
end
|
|
62
|
+
|
|
63
|
+
def self.mark_failed!(id, now: Time.current) # rubocop:disable Naming/PredicateMethod -- reports whether it stamped
|
|
64
|
+
where(id: id, failed_at: nil).update_all(failed_at: now) == 1
|
|
65
|
+
end
|
|
66
|
+
|
|
67
|
+
Outcome = Data.define(:task_key, :version, :revision, :completed, :latest_failed, :latest_id)
|
|
68
|
+
|
|
69
|
+
# One Outcome per (task_key, version, revision) of +keys+: whether any run
|
|
70
|
+
# completed, whether the newest one failed without completing, and that
|
|
71
|
+
# newest run's id.
|
|
72
|
+
# A run with an outcome counts even when recording its enqueue failed
|
|
73
|
+
# (no queue_name): the worker ran it.
|
|
74
|
+
def self.outcomes_for(keys)
|
|
75
|
+
return [] if keys.empty?
|
|
76
|
+
|
|
77
|
+
where("queue_name IS NOT NULL OR completed_at IS NOT NULL OR failed_at IS NOT NULL")
|
|
78
|
+
.where(task_key: keys).group(:task_key, :version, :revision).pluck(
|
|
79
|
+
:task_key, :version, :revision, Arel.sql("bool_or(completed_at IS NOT NULL)"),
|
|
80
|
+
Arel.sql("(array_agg(failed_at IS NOT NULL AND completed_at IS NULL ORDER BY id DESC))[1]"),
|
|
81
|
+
Arel.sql("MAX(id)")
|
|
82
|
+
).map do |row|
|
|
83
|
+
Outcome.new(*row)
|
|
84
|
+
end
|
|
85
|
+
end
|
|
44
86
|
end
|
|
45
87
|
end
|
|
@@ -44,6 +44,9 @@
|
|
|
44
44
|
<td data-label="<%= t("pgbus.deploy_tasks.tasks_table.headers.state") %>" class="px-4 py-3">
|
|
45
45
|
<%= pgbus_deploy_state_badge(result) %>
|
|
46
46
|
<p class="mt-1 text-xs text-gray-600 dark:text-gray-300"><%= pgbus_deploy_task_reason(result) %></p>
|
|
47
|
+
<% if task[:waiting_on].present? %>
|
|
48
|
+
<p class="mt-1 text-xs text-gray-600 dark:text-gray-300" data-waiting-on><%= pgbus_deploy_waiting_on(task[:waiting_on]) %></p>
|
|
49
|
+
<% end %>
|
|
47
50
|
</td>
|
|
48
51
|
<td data-label="<%= t("pgbus.deploy_tasks.tasks_table.headers.actions") %>" class="px-4 py-3 text-right space-x-1">
|
|
49
52
|
<%= pgbus_button_to task[:enabled] ? t("pgbus.deploy_tasks.disable") : t("pgbus.deploy_tasks.enable"),
|
|
@@ -10,7 +10,17 @@
|
|
|
10
10
|
<%= pgbus_button_to @task[:enabled] ? t("pgbus.deploy_tasks.disable") : t("pgbus.deploy_tasks.enable"),
|
|
11
11
|
pgbus.toggle_deploy_task_path(@task[:id]),
|
|
12
12
|
variant: @task[:enabled] ? :warning : :success %>
|
|
13
|
-
<% if @task[:enabled] %>
|
|
13
|
+
<% if @task[:enabled] && @task[:waiting_on].present? %>
|
|
14
|
+
<%= form_with url: pgbus.enqueue_deploy_task_path(@task[:id]), method: :post, local: true,
|
|
15
|
+
class: "flex items-center space-x-2", data: { run_now_form: true } do %>
|
|
16
|
+
<label class="flex items-center space-x-2 text-sm text-gray-700 dark:text-gray-200">
|
|
17
|
+
<input type="checkbox" name="ignore_dependencies" value="1"
|
|
18
|
+
class="h-4 w-4 rounded border-gray-300 text-indigo-600 dark:text-indigo-400 focus:ring-indigo-600">
|
|
19
|
+
<span><%= t("pgbus.deploy_tasks.show.ignore_dependencies") %></span>
|
|
20
|
+
</label>
|
|
21
|
+
<%= pgbus_button_tag t("pgbus.deploy_tasks.run_now"), variant: :primary %>
|
|
22
|
+
<% end %>
|
|
23
|
+
<% elsif @task[:enabled] %>
|
|
14
24
|
<%= pgbus_button_to t("pgbus.deploy_tasks.run_now"), pgbus.enqueue_deploy_task_path(@task[:id]), variant: :primary %>
|
|
15
25
|
<% end %>
|
|
16
26
|
<%= pgbus_link_to t("pgbus.deploy_tasks.show.back"), pgbus.deploy_tasks_path, variant: :secondary %>
|
|
@@ -23,6 +33,9 @@
|
|
|
23
33
|
<p class="text-sm font-medium text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.state") %></p>
|
|
24
34
|
<p class="mt-1"><%= pgbus_deploy_state_badge(result) %></p>
|
|
25
35
|
<p class="mt-1 text-xs text-gray-600 dark:text-gray-300"><%= pgbus_deploy_task_reason(result) %></p>
|
|
36
|
+
<% if @task[:waiting_on].present? %>
|
|
37
|
+
<p class="mt-1 text-xs text-gray-600 dark:text-gray-300" data-waiting-on><%= pgbus_deploy_waiting_on(@task[:waiting_on]) %></p>
|
|
38
|
+
<% end %>
|
|
26
39
|
</div>
|
|
27
40
|
|
|
28
41
|
<div class="rounded-lg bg-white dark:bg-gray-800 p-5 shadow ring-1 ring-gray-200 dark:ring-gray-700">
|
|
@@ -72,6 +85,12 @@
|
|
|
72
85
|
armed_for: @task[:every_deploy] ? @task[:armed_for] : t("pgbus.deploy_tasks.version", version: @task[:armed_for])) %></dd>
|
|
73
86
|
</div>
|
|
74
87
|
<% end %>
|
|
88
|
+
<% if @task[:dependencies].present? %>
|
|
89
|
+
<div>
|
|
90
|
+
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.labels.after") %></dt>
|
|
91
|
+
<dd class="mt-1 text-sm text-gray-900 dark:text-white font-mono text-xs"><%= @task[:dependencies].join(", ") %></dd>
|
|
92
|
+
</div>
|
|
93
|
+
<% end %>
|
|
75
94
|
<% if @task[:arguments]&.any? %>
|
|
76
95
|
<div class="sm:col-span-2">
|
|
77
96
|
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.labels.arguments") %></dt>
|
|
@@ -104,6 +123,7 @@
|
|
|
104
123
|
<th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.run_headers.revision") %></th>
|
|
105
124
|
<th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.run_headers.queue") %></th>
|
|
106
125
|
<th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.run_headers.enqueued_at") %></th>
|
|
126
|
+
<th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.deploy_tasks.show.run_headers.outcome") %></th>
|
|
107
127
|
</tr>
|
|
108
128
|
</thead>
|
|
109
129
|
<tbody class="divide-y divide-gray-100 dark:divide-gray-700">
|
|
@@ -124,10 +144,13 @@
|
|
|
124
144
|
<td data-label="<%= t("pgbus.deploy_tasks.show.run_headers.enqueued_at") %>" class="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">
|
|
125
145
|
<%= pgbus_time(run[:run_at]) %>
|
|
126
146
|
</td>
|
|
147
|
+
<td data-label="<%= t("pgbus.deploy_tasks.show.run_headers.outcome") %>" class="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">
|
|
148
|
+
<%= pgbus_deploy_run_outcome(run) %>
|
|
149
|
+
</td>
|
|
127
150
|
</tr>
|
|
128
151
|
<% end %>
|
|
129
152
|
<% if Array(@task[:runs]).empty? %>
|
|
130
|
-
<%= render "pgbus/shared/empty_row", colspan:
|
|
153
|
+
<%= render "pgbus/shared/empty_row", colspan: 6, message: t("pgbus.deploy_tasks.show.no_runs") %>
|
|
131
154
|
<% end %>
|
|
132
155
|
</tbody>
|
|
133
156
|
</table>
|
data/config/i18n-tasks.yml
CHANGED
|
@@ -41,6 +41,7 @@ ignore_unused:
|
|
|
41
41
|
- "pgbus.recurring_tasks.index.task_count.*"
|
|
42
42
|
- "pgbus.deploy_tasks.banner.lagging_html.*"
|
|
43
43
|
- "pgbus.deploy_tasks.reasons.waiting_lagging_html.*"
|
|
44
|
+
- "pgbus.deploy_tasks.reasons.waiting_dependencies_html.*"
|
|
44
45
|
- "pgbus.processes.state.activity.schedule.*"
|
|
45
46
|
- "pgbus.processes.state.activity.slots.*"
|
|
46
47
|
- "pgbus.processes.state.activity.threads.*"
|
data/config/locales/da.yml
CHANGED
|
@@ -260,9 +260,14 @@ da:
|
|
|
260
260
|
ready_html: 'Udrullet: hver aktiv proces kører <code>%{revision}</code>. Ventende opgaver kører ved planlæggerens næste tick.'
|
|
261
261
|
unavailable_html: Udrulningsstatussen kunne ikke læses.
|
|
262
262
|
default_queue: default
|
|
263
|
+
dependency_states:
|
|
264
|
+
failed: fejlet
|
|
265
|
+
not_run: ikke kørt
|
|
266
|
+
running: kører
|
|
263
267
|
disable: Deaktiver
|
|
264
268
|
enable: Aktiver
|
|
265
269
|
enqueue:
|
|
270
|
+
blocked: 'Kør nu blev afvist: opgaven venter på %{tasks}. Sæt flueben i "Ignorer afhængigheder" for at køre den alligevel.'
|
|
266
271
|
enqueued: Deploy-opgaven er sat i kø
|
|
267
272
|
failed: 'Deploy-opgaven blev ikke sat i kø: se loggen for årsagen'
|
|
268
273
|
every_deploy: Ved hver deploy
|
|
@@ -272,6 +277,10 @@ da:
|
|
|
272
277
|
other: "%{count} opgaver erklæret"
|
|
273
278
|
title: Deploy-opgaver
|
|
274
279
|
not_found: Deploy-opgaven blev ikke fundet
|
|
280
|
+
outcomes:
|
|
281
|
+
completed_html: Fuldført %{ago}
|
|
282
|
+
failed_html: Fejlet %{ago}
|
|
283
|
+
none: Intet udfald endnu
|
|
275
284
|
reasons:
|
|
276
285
|
disabled_armed_html: 'Deaktiveret med en ventende udrulningskørsel: aktiver den for at lade den køre.'
|
|
277
286
|
disabled_html: 'Deaktiveret: planlæggeren springer den over.'
|
|
@@ -279,6 +288,9 @@ da:
|
|
|
279
288
|
manual_html: "· kørte %{ago} (manuelt)"
|
|
280
289
|
never_html: Har aldrig kørt efter en udrulning.
|
|
281
290
|
ran_html: Kørte %{ago} på <code>%{revision}</code> (udrulning).
|
|
291
|
+
waiting_dependencies_html:
|
|
292
|
+
one: Venter på at 1 afhængighed bliver færdig.
|
|
293
|
+
other: Venter på at %{count} afhængigheder bliver færdige.
|
|
282
294
|
waiting_lagging_html:
|
|
283
295
|
one: 'Venter på udrulning: 1 proces kører endnu ikke <code>%{revision}</code>.'
|
|
284
296
|
other: 'Venter på udrulning: %{count} processer kører endnu ikke <code>%{revision}</code>.'
|
|
@@ -291,7 +303,9 @@ da:
|
|
|
291
303
|
armed_html: "%{armed_for}, klargjort %{ago}"
|
|
292
304
|
back: Tilbage
|
|
293
305
|
configuration: Konfiguration
|
|
306
|
+
ignore_dependencies: Ignorer afhængigheder
|
|
294
307
|
labels:
|
|
308
|
+
after: Efter
|
|
295
309
|
arguments: Argumenter
|
|
296
310
|
armed: Ventende kørsel
|
|
297
311
|
command: Kommando
|
|
@@ -305,6 +319,7 @@ da:
|
|
|
305
319
|
recent_runs: Seneste kørsler
|
|
306
320
|
run_headers:
|
|
307
321
|
enqueued_at: Sat i kø
|
|
322
|
+
outcome: Udfald
|
|
308
323
|
queue: Kø
|
|
309
324
|
revision: Revision
|
|
310
325
|
triggered_by: Startet af
|
|
@@ -338,6 +353,9 @@ da:
|
|
|
338
353
|
manual: Manuelt
|
|
339
354
|
rollover: Udrulning
|
|
340
355
|
version: v%{version}
|
|
356
|
+
waiting_on:
|
|
357
|
+
dependency_html: "<code>%{key}</code> (%{state})"
|
|
358
|
+
label: 'Venter på:'
|
|
341
359
|
dialogs:
|
|
342
360
|
cancel: Annuller
|
|
343
361
|
confirm: Bekræft
|
data/config/locales/de.yml
CHANGED
|
@@ -260,9 +260,14 @@ de:
|
|
|
260
260
|
ready_html: 'Rollover abgeschlossen: Jeder aktive Prozess läuft auf <code>%{revision}</code>. Vorgemerkte Aufgaben laufen beim nächsten Scheduler-Tick.'
|
|
261
261
|
unavailable_html: Der Rollover-Status konnte nicht gelesen werden.
|
|
262
262
|
default_queue: default
|
|
263
|
+
dependency_states:
|
|
264
|
+
failed: fehlgeschlagen
|
|
265
|
+
not_run: nicht gelaufen
|
|
266
|
+
running: läuft
|
|
263
267
|
disable: Deaktivieren
|
|
264
268
|
enable: Aktivieren
|
|
265
269
|
enqueue:
|
|
270
|
+
blocked: 'Jetzt ausführen abgelehnt: Die Aufgabe wartet auf %{tasks}. Aktiviere "Abhängigkeiten ignorieren", um sie trotzdem auszuführen.'
|
|
266
271
|
enqueued: Deploy-Aufgabe eingereiht
|
|
267
272
|
failed: 'Die Deploy-Aufgabe wurde nicht eingereiht: Den Grund findest du im Log'
|
|
268
273
|
every_deploy: Bei jedem Deploy
|
|
@@ -272,6 +277,10 @@ de:
|
|
|
272
277
|
other: "%{count} Aufgaben deklariert"
|
|
273
278
|
title: Deploy-Aufgaben
|
|
274
279
|
not_found: Deploy-Aufgabe nicht gefunden
|
|
280
|
+
outcomes:
|
|
281
|
+
completed_html: Abgeschlossen %{ago}
|
|
282
|
+
failed_html: Fehlgeschlagen %{ago}
|
|
283
|
+
none: Noch kein Ergebnis
|
|
275
284
|
reasons:
|
|
276
285
|
disabled_armed_html: 'Deaktiviert mit ausstehendem Rollover-Lauf: Aktiviere sie, damit sie ausgelöst wird.'
|
|
277
286
|
disabled_html: 'Deaktiviert: Der Scheduler überspringt sie.'
|
|
@@ -279,6 +288,9 @@ de:
|
|
|
279
288
|
manual_html: "· lief %{ago} (manuell)"
|
|
280
289
|
never_html: Nach keinem Rollover gelaufen.
|
|
281
290
|
ran_html: Lief %{ago} auf <code>%{revision}</code> (Rollover).
|
|
291
|
+
waiting_dependencies_html:
|
|
292
|
+
one: Wartet darauf, dass 1 Abhängigkeit abgeschlossen ist.
|
|
293
|
+
other: Wartet darauf, dass %{count} Abhängigkeiten abgeschlossen sind.
|
|
282
294
|
waiting_lagging_html:
|
|
283
295
|
one: 'Warte auf Rollover: 1 Prozess läuft noch nicht auf <code>%{revision}</code>.'
|
|
284
296
|
other: 'Warte auf Rollover: %{count} Prozesse laufen noch nicht auf <code>%{revision}</code>.'
|
|
@@ -291,7 +303,9 @@ de:
|
|
|
291
303
|
armed_html: "%{armed_for}, vorgemerkt %{ago}"
|
|
292
304
|
back: Zurück
|
|
293
305
|
configuration: Konfiguration
|
|
306
|
+
ignore_dependencies: Abhängigkeiten ignorieren
|
|
294
307
|
labels:
|
|
308
|
+
after: Nach
|
|
295
309
|
arguments: Argumente
|
|
296
310
|
armed: Ausstehende Vormerkung
|
|
297
311
|
command: Befehl
|
|
@@ -305,6 +319,7 @@ de:
|
|
|
305
319
|
recent_runs: Letzte Läufe
|
|
306
320
|
run_headers:
|
|
307
321
|
enqueued_at: Eingereiht am
|
|
322
|
+
outcome: Ergebnis
|
|
308
323
|
queue: Warteschlange
|
|
309
324
|
revision: Revision
|
|
310
325
|
triggered_by: Ausgelöst durch
|
|
@@ -338,6 +353,9 @@ de:
|
|
|
338
353
|
manual: Manuell
|
|
339
354
|
rollover: Rollover
|
|
340
355
|
version: v%{version}
|
|
356
|
+
waiting_on:
|
|
357
|
+
dependency_html: "<code>%{key}</code> (%{state})"
|
|
358
|
+
label: 'Wartet auf:'
|
|
341
359
|
dialogs:
|
|
342
360
|
cancel: Abbrechen
|
|
343
361
|
confirm: Bestätigen
|
data/config/locales/en.yml
CHANGED
|
@@ -260,9 +260,14 @@ en:
|
|
|
260
260
|
ready_html: 'Rolled over: every live process runs <code>%{revision}</code>. Armed tasks run on the scheduler''s next tick.'
|
|
261
261
|
unavailable_html: The rollover status could not be read.
|
|
262
262
|
default_queue: default
|
|
263
|
+
dependency_states:
|
|
264
|
+
failed: failed
|
|
265
|
+
not_run: not run
|
|
266
|
+
running: running
|
|
263
267
|
disable: Disable
|
|
264
268
|
enable: Enable
|
|
265
269
|
enqueue:
|
|
270
|
+
blocked: 'Run now refused: this task waits on %{tasks}. Tick "Ignore dependencies" to run it anyway.'
|
|
266
271
|
enqueued: Deploy task enqueued
|
|
267
272
|
failed: 'The deploy task was not enqueued: see the log for the reason'
|
|
268
273
|
every_deploy: Every deploy
|
|
@@ -272,6 +277,10 @@ en:
|
|
|
272
277
|
other: "%{count} tasks declared"
|
|
273
278
|
title: Deploy Tasks
|
|
274
279
|
not_found: Deploy task not found
|
|
280
|
+
outcomes:
|
|
281
|
+
completed_html: Completed %{ago}
|
|
282
|
+
failed_html: Failed %{ago}
|
|
283
|
+
none: No outcome yet
|
|
275
284
|
reasons:
|
|
276
285
|
disabled_armed_html: 'Disabled with a rollover run pending: enable it to let it fire.'
|
|
277
286
|
disabled_html: 'Disabled: the scheduler skips it.'
|
|
@@ -279,6 +288,9 @@ en:
|
|
|
279
288
|
manual_html: "· ran %{ago} (manual)"
|
|
280
289
|
never_html: Never ran after a rollover.
|
|
281
290
|
ran_html: Ran %{ago} on <code>%{revision}</code> (rollover).
|
|
291
|
+
waiting_dependencies_html:
|
|
292
|
+
one: Waiting for 1 dependency to complete.
|
|
293
|
+
other: Waiting for %{count} dependencies to complete.
|
|
282
294
|
waiting_lagging_html:
|
|
283
295
|
one: 'Waiting for rollover: 1 process is not on <code>%{revision}</code> yet.'
|
|
284
296
|
other: 'Waiting for rollover: %{count} processes are not on <code>%{revision}</code> yet.'
|
|
@@ -291,7 +303,9 @@ en:
|
|
|
291
303
|
armed_html: "%{armed_for}, armed %{ago}"
|
|
292
304
|
back: Back
|
|
293
305
|
configuration: Configuration
|
|
306
|
+
ignore_dependencies: Ignore dependencies
|
|
294
307
|
labels:
|
|
308
|
+
after: After
|
|
295
309
|
arguments: Arguments
|
|
296
310
|
armed: Pending arm
|
|
297
311
|
command: Command
|
|
@@ -305,6 +319,7 @@ en:
|
|
|
305
319
|
recent_runs: Recent Runs
|
|
306
320
|
run_headers:
|
|
307
321
|
enqueued_at: Enqueued At
|
|
322
|
+
outcome: Outcome
|
|
308
323
|
queue: Queue
|
|
309
324
|
revision: Revision
|
|
310
325
|
triggered_by: Triggered By
|
|
@@ -338,6 +353,9 @@ en:
|
|
|
338
353
|
manual: Manual
|
|
339
354
|
rollover: Rollover
|
|
340
355
|
version: v%{version}
|
|
356
|
+
waiting_on:
|
|
357
|
+
dependency_html: "<code>%{key}</code> (%{state})"
|
|
358
|
+
label: 'Waiting on:'
|
|
341
359
|
dialogs:
|
|
342
360
|
cancel: Cancel
|
|
343
361
|
confirm: Confirm
|
data/config/locales/es.yml
CHANGED
|
@@ -260,9 +260,14 @@ es:
|
|
|
260
260
|
ready_html: 'Transición completa: cada proceso activo ejecuta <code>%{revision}</code>. Las tareas armadas se ejecutan en el siguiente tick del planificador.'
|
|
261
261
|
unavailable_html: No se pudo leer el estado de la transición.
|
|
262
262
|
default_queue: default
|
|
263
|
+
dependency_states:
|
|
264
|
+
failed: fallida
|
|
265
|
+
not_run: no ejecutada
|
|
266
|
+
running: en ejecución
|
|
263
267
|
disable: Desactivar
|
|
264
268
|
enable: Activar
|
|
265
269
|
enqueue:
|
|
270
|
+
blocked: 'Ejecutar ahora rechazado: la tarea espera a %{tasks}. Marca "Ignorar dependencias" para ejecutarla de todos modos.'
|
|
266
271
|
enqueued: Tarea de despliegue encolada
|
|
267
272
|
failed: 'La tarea de despliegue no se encoló: consulta el registro para ver el motivo'
|
|
268
273
|
every_deploy: En cada despliegue
|
|
@@ -272,6 +277,10 @@ es:
|
|
|
272
277
|
other: "%{count} tareas declaradas"
|
|
273
278
|
title: Tareas de despliegue
|
|
274
279
|
not_found: Tarea de despliegue no encontrada
|
|
280
|
+
outcomes:
|
|
281
|
+
completed_html: Completada %{ago}
|
|
282
|
+
failed_html: Fallida %{ago}
|
|
283
|
+
none: Sin resultado todavía
|
|
275
284
|
reasons:
|
|
276
285
|
disabled_armed_html: 'Desactivada con una ejecución de transición pendiente: actívala para que se ejecute.'
|
|
277
286
|
disabled_html: 'Desactivada: el planificador la omite.'
|
|
@@ -279,6 +288,9 @@ es:
|
|
|
279
288
|
manual_html: "· se ejecutó %{ago} (manual)"
|
|
280
289
|
never_html: Nunca se ejecutó tras una transición.
|
|
281
290
|
ran_html: Se ejecutó %{ago} en <code>%{revision}</code> (transición).
|
|
291
|
+
waiting_dependencies_html:
|
|
292
|
+
one: Esperando a que termine 1 dependencia.
|
|
293
|
+
other: Esperando a que terminen %{count} dependencias.
|
|
282
294
|
waiting_lagging_html:
|
|
283
295
|
one: 'Esperando la transición: 1 proceso aún no ejecuta <code>%{revision}</code>.'
|
|
284
296
|
other: 'Esperando la transición: %{count} procesos aún no ejecutan <code>%{revision}</code>.'
|
|
@@ -291,7 +303,9 @@ es:
|
|
|
291
303
|
armed_html: "%{armed_for}, armada %{ago}"
|
|
292
304
|
back: Volver
|
|
293
305
|
configuration: Configuración
|
|
306
|
+
ignore_dependencies: Ignorar dependencias
|
|
294
307
|
labels:
|
|
308
|
+
after: Después de
|
|
295
309
|
arguments: Argumentos
|
|
296
310
|
armed: Ejecución pendiente
|
|
297
311
|
command: Comando
|
|
@@ -305,6 +319,7 @@ es:
|
|
|
305
319
|
recent_runs: Ejecuciones recientes
|
|
306
320
|
run_headers:
|
|
307
321
|
enqueued_at: Encolada el
|
|
322
|
+
outcome: Resultado
|
|
308
323
|
queue: Cola
|
|
309
324
|
revision: Revisión
|
|
310
325
|
triggered_by: Lanzada por
|
|
@@ -338,6 +353,9 @@ es:
|
|
|
338
353
|
manual: Manual
|
|
339
354
|
rollover: Transición
|
|
340
355
|
version: v%{version}
|
|
356
|
+
waiting_on:
|
|
357
|
+
dependency_html: "<code>%{key}</code> (%{state})"
|
|
358
|
+
label: 'Esperando a:'
|
|
341
359
|
dialogs:
|
|
342
360
|
cancel: Cancelar
|
|
343
361
|
confirm: Confirmar
|
data/config/locales/fi.yml
CHANGED
|
@@ -260,9 +260,14 @@ fi:
|
|
|
260
260
|
ready_html: 'Käyttöönotto valmis: jokainen elävä prosessi ajaa versiota <code>%{revision}</code>. Odottavat tehtävät ajetaan ajastimen seuraavalla kierroksella.'
|
|
261
261
|
unavailable_html: Käyttöönoton tilaa ei voitu lukea.
|
|
262
262
|
default_queue: default
|
|
263
|
+
dependency_states:
|
|
264
|
+
failed: epäonnistui
|
|
265
|
+
not_run: ei ajettu
|
|
266
|
+
running: käynnissä
|
|
263
267
|
disable: Poista käytöstä
|
|
264
268
|
enable: Ota käyttöön
|
|
265
269
|
enqueue:
|
|
270
|
+
blocked: 'Suorita nyt hylättiin: tehtävä odottaa tehtäviä %{tasks}. Valitse "Ohita riippuvuudet" suorittaaksesi sen silti.'
|
|
266
271
|
enqueued: Deploy-tehtävä lisätty jonoon
|
|
267
272
|
failed: 'Deploy-tehtävää ei lisätty jonoon: syy löytyy lokista'
|
|
268
273
|
every_deploy: Jokaisessa deployssa
|
|
@@ -272,6 +277,10 @@ fi:
|
|
|
272
277
|
other: "%{count} tehtävää määritelty"
|
|
273
278
|
title: Deploy-tehtävät
|
|
274
279
|
not_found: Deploy-tehtävää ei löytynyt
|
|
280
|
+
outcomes:
|
|
281
|
+
completed_html: Valmistui %{ago}
|
|
282
|
+
failed_html: Epäonnistui %{ago}
|
|
283
|
+
none: Ei vielä tulosta
|
|
275
284
|
reasons:
|
|
276
285
|
disabled_armed_html: 'Poistettu käytöstä, käyttöönottoajo odottaa: ota se käyttöön, jotta se ajetaan.'
|
|
277
286
|
disabled_html: 'Poistettu käytöstä: ajastin ohittaa sen.'
|
|
@@ -279,6 +288,9 @@ fi:
|
|
|
279
288
|
manual_html: "· ajettu %{ago} (manuaalisesti)"
|
|
280
289
|
never_html: Ei koskaan ajettu käyttöönoton jälkeen.
|
|
281
290
|
ran_html: Ajettu %{ago} versiossa <code>%{revision}</code> (käyttöönotto).
|
|
291
|
+
waiting_dependencies_html:
|
|
292
|
+
one: Odottaa, että 1 riippuvuus valmistuu.
|
|
293
|
+
other: Odottaa, että %{count} riippuvuutta valmistuu.
|
|
282
294
|
waiting_lagging_html:
|
|
283
295
|
one: 'Odotetaan käyttöönottoa: 1 prosessi ei vielä aja versiota <code>%{revision}</code>.'
|
|
284
296
|
other: 'Odotetaan käyttöönottoa: %{count} prosessia ei vielä aja versiota <code>%{revision}</code>.'
|
|
@@ -291,7 +303,9 @@ fi:
|
|
|
291
303
|
armed_html: "%{armed_for}, valmisteltu %{ago}"
|
|
292
304
|
back: Takaisin
|
|
293
305
|
configuration: Asetukset
|
|
306
|
+
ignore_dependencies: Ohita riippuvuudet
|
|
294
307
|
labels:
|
|
308
|
+
after: Jälkeen
|
|
295
309
|
arguments: Argumentit
|
|
296
310
|
armed: Odottava ajo
|
|
297
311
|
command: Komento
|
|
@@ -305,6 +319,7 @@ fi:
|
|
|
305
319
|
recent_runs: Viimeisimmät ajot
|
|
306
320
|
run_headers:
|
|
307
321
|
enqueued_at: Lisätty jonoon
|
|
322
|
+
outcome: Tulos
|
|
308
323
|
queue: Jono
|
|
309
324
|
revision: Versio
|
|
310
325
|
triggered_by: Käynnistäjä
|
|
@@ -338,6 +353,9 @@ fi:
|
|
|
338
353
|
manual: Manuaalinen
|
|
339
354
|
rollover: Käyttöönotto
|
|
340
355
|
version: v%{version}
|
|
356
|
+
waiting_on:
|
|
357
|
+
dependency_html: "<code>%{key}</code> (%{state})"
|
|
358
|
+
label: 'Odottaa:'
|
|
341
359
|
dialogs:
|
|
342
360
|
cancel: Peruuta
|
|
343
361
|
confirm: Vahvista
|