summaryrefslogtreecommitdiff
path: root/app/services/clusters/applications
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2019-04-29 15:57:12 +1000
committerStan Hu <stanhu@gmail.com>2019-04-29 22:55:13 -0700
commitf84fae1386eec1b22c1405a8b87beb30d8f10519 (patch)
treea5c43d8c0e6bf7cc007749a7a650727cc22f46b0 /app/services/clusters/applications
parenta1c216e5e4f566b762e185ad36bf566f14268cba (diff)
downloadgitlab-ce-f84fae1386eec1b22c1405a8b87beb30d8f10519.tar.gz
Rename #timeouted -> #timed_out
Diffstat (limited to 'app/services/clusters/applications')
-rw-r--r--app/services/clusters/applications/check_installation_progress_service.rb4
-rw-r--r--app/services/clusters/applications/check_uninstall_progress_service.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index c592d608b89..ae4b86a0614 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -37,7 +37,7 @@ module Clusters
end
def check_timeout
- if timeouted?
+ if timed_out?
begin
app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
end
@@ -51,7 +51,7 @@ module Clusters
install_command.pod_name
end
- def timeouted?
+ def timed_out?
Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
end
diff --git a/app/services/clusters/applications/check_uninstall_progress_service.rb b/app/services/clusters/applications/check_uninstall_progress_service.rb
index 663e4b1daef..022cc754af9 100644
--- a/app/services/clusters/applications/check_uninstall_progress_service.rb
+++ b/app/services/clusters/applications/check_uninstall_progress_service.rb
@@ -35,7 +35,7 @@ module Clusters
end
def check_timeout
- if timeouted?
+ if timed_out?
app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
else
WaitForUninstallAppWorker.perform_in(WaitForUninstallAppWorker::INTERVAL, app.name, app.id)
@@ -46,7 +46,7 @@ module Clusters
app.uninstall_command.pod_name
end
- def timeouted?
+ def timed_out?
Time.now.utc - app.updated_at.to_time.utc > WaitForUninstallAppWorker::TIMEOUT
end