Move section for clearing out old sessions

app/routes.py

@@ -66,8 +66,11 @@ def session_required(f):
                 'cookies_disabled' not in request.args):
             g.session_key = session['key']
         else:
-            invalid_sessions = []
             session.pop('_permanent', None)
+            g.session_key = app.default_key
+
+        # Clear out old sessions
+        invalid_sessions = []
         for user_session in os.listdir(app.config['SESSION_FILE_DIR']):
             session_path = os.path.join(
                 app.config['SESSION_FILE_DIR'],
@@ -79,12 +82,11 @@ def session_required(f):
                     if isinstance(data, dict) and 'valid' in data:
                         continue
                     invalid_sessions.append(session_path)
-                except FileNotFoundError:
+            except (EOFError, FileNotFoundError):
                 pass
 
         for invalid_session in invalid_sessions:
             os.remove(invalid_session)
-            g.session_key = app.default_key
 
         return f(*args, **kwargs)