From d63b9d2f9bfc46613295496ac2efd41c602e0151 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Tue, 5 May 2015 16:10:06 +0200 Subject: [PATCH] Corrected with rubocop cop 'Style/InfiniteLoop'. --- .rubocop.yml | 2 -- app/controllers/long_polling_controller.rb | 2 +- app/models/scheduler.rb | 4 ++-- lib/sessions.rb | 2 +- lib/sessions/client.rb | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0ca61a12b..cd474a394 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -262,8 +262,6 @@ Lint/UnreachableCode: Enabled: false Lint/ShadowingOuterLocalVariable: Enabled: false -Style/InfiniteLoop: - Enabled: false Lint/Eval: Enabled: false Style/ModuleFunction: diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 6a496b991..302d49fdd 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -120,7 +120,7 @@ class LongPollingController < ApplicationController # set max loop time to 24 sec. because of 30 sec. timeout of mod_proxy count = 12 - while true + loop do count = count - 1 queue = Sessions.queue( client_id ) if queue && queue[0] diff --git a/app/models/scheduler.rb b/app/models/scheduler.rb index 4802a7241..f59c13795 100644 --- a/app/models/scheduler.rb +++ b/app/models/scheduler.rb @@ -7,7 +7,7 @@ class Scheduler < ApplicationModel Thread.abort_on_exception = true jobs_started = {} - while true + loop do logger.info "Scheduler running (runner #{runner} of #{runner_count})..." # reconnect in case db connection is lost @@ -34,7 +34,7 @@ class Scheduler < ApplicationModel Thread.new { if job.period - while true + loop do self._start_job( job, runner, runner_count ) job = Scheduler.lookup( id: job.id ) diff --git a/lib/sessions.rb b/lib/sessions.rb index 52b63a5ca..294841ff2 100644 --- a/lib/sessions.rb +++ b/lib/sessions.rb @@ -505,7 +505,7 @@ returns end Thread.abort_on_exception = true - while true + loop do client_ids = self.sessions client_ids.each { |client_id| diff --git a/lib/sessions/client.rb b/lib/sessions/client.rb index 1a0ee9643..0fe2657c6 100644 --- a/lib/sessions/client.rb +++ b/lib/sessions/client.rb @@ -21,7 +21,7 @@ class Sessions::Client backend_pool = [] user_id_last_run = nil loop_count = 0 - while true + loop do # get connection user session_data = Sessions.get( @client_id )