[arvados] updated: 2.5.0-178-gfcfc96143

git repository hosting git at public.arvados.org
Mon Feb 20 20:34:30 UTC 2023


Summary of changes:
 apps/workbench/config/initializers/reload_config.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  fcfc961430e59fc19a0cee846c32bbe822463aa0 (commit)
      from  e03ebe77c257e44645c64c8cd71e5e7c115991ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fcfc961430e59fc19a0cee846c32bbe822463aa0
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Feb 20 15:30:57 2023 -0500

    20137: Fix incorrect keyword in Workbench1 config reload loop
    
    This has the same rationale as e03ebe77c. I don't know if this code
    is being exercised anywhere, but I don't want to find out the hard way
    that the answer is yes.
    Refs #20137.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/apps/workbench/config/initializers/reload_config.rb b/apps/workbench/config/initializers/reload_config.rb
index 58949c5e9..6c5632e05 100644
--- a/apps/workbench/config/initializers/reload_config.rb
+++ b/apps/workbench/config/initializers/reload_config.rb
@@ -39,13 +39,13 @@ else
           rescue => e
             Rails.logger.info("reload_config: config file updated but could not be loaded: #{e}")
             t_lastload = t
-            continue
+            next
           end
           if hash == hash_lastload
             # If we reloaded a new or updated file, but the content is
             # identical, keep polling instead of restarting.
             t_lastload = t
-            continue
+            next
           end
 
           restartfile = Rails.root.join('tmp', 'restart.txt')

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list