add to build script, explicitly eager load the Script's db connection if Marshal fails because its stuff isn't loaded

Author: laurelfan

aws/build.rake

@@ -158,6 +158,9 @@ $websites = build_task('websites', [deploy_dir('rebuild'), BLOCKLY_COMMIT_TASK])
     RakeUtils.system 'rake', 'build'
 
     if rack_env?(:production) && CDO.daemon
+      HipChat.log "Putting <b>dashboard</b> scripts in redis..."
+      RakeUtils.rake 'seed:script_cache_to_redis'
+
       thread_count = 1 + (CDO.app_servers.keys.count / 10)
       threaded_each CDO.app_servers.keys, thread_count do |name|
         upgrade_frontend name, CDO.app_servers[name]

dashboard/app/models/script.rb

@@ -80,7 +80,21 @@ def self.redis
   def self.script_cache_from_redis
     return unless redis
     if marshalled = self.redis['script-cache']
-      Marshal.load marshalled
+      begin
+        retried = false
+        Marshal.load marshalled
+      rescue NameError
+        # rails tries to do some fancy lazy loading of the database
+        # connection. If, somehow, this is called before we ever load
+        # a Script from the database, Marshal.load will get confused
+        # because not all of the classes Script depends on are
+        # loaded. Do a silly query to get everything loaded first.
+        self.exists?
+        unless retried
+          retried = true
+          retry
+        end
+      end
     end
   end