Skip to content

Commit

Permalink
Merge pull request #308 from benjwadams/session_overhaul
Browse files Browse the repository at this point in the history
Use Flask-Session
  • Loading branch information
benjwadams authored Dec 8, 2023
2 parents 2845048 + 860a58c commit d69e4b4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ COMMON: &common
REDIS_HOST: localhost
REDIS_PORT: 6379
REDIS_DB: 8
SESSION_PERMANENT: True
SESSION_TYPE: redis

JSON_DIR: '/data/data/priv_erddap/'
path2priv: '/data/data/priv_erddap/'
Expand Down
9 changes: 7 additions & 2 deletions glider_dac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from flasgger import Swagger, LazyString, LazyJSONEncoder
from flask import Flask, request
from flask_kvsession import KVSessionExtension
from flask_session import Session
from flask_cors import CORS, cross_origin
from flask_wtf import CSRFProtect
from simplekv.memory.redisstore import RedisStore
Expand Down Expand Up @@ -47,16 +47,21 @@
except KeyError:
app.config.update(config_dict["DEVELOPMENT"])

app.secret_key = app.config["SECRET_KEY"]
app.config["SESSION_TYPE"] = "redis"
app.config["SESSION_REDIS"] = redis.from_url(app.config["REDIS_URL"])
Session(app)

import redis
redis_pool = redis.ConnectionPool(host=app.config.get('REDIS_HOST'),
port=app.config.get('REDIS_PORT'),
db=app.config.get('REDIS_DB'))
redis_connection = redis.Redis(connection_pool=redis_pool)
strict_redis = redis.StrictRedis(connection_pool=redis_pool)


store = RedisStore(strict_redis)

KVSessionExtension(store, app)

from rq import Queue
queue = Queue('default', connection=redis_connection)
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ Flask-Mail==0.9.0
Flask-Script==2.0.5
feedparser==5.1.3
sh==1.09
requests>=2.20.0
passlib>=1.7.1
requests>=2.20.0
simplekv
Werkzeug<3.0.0
thredds_crawler>=1.5.4
Flask-KVSession==0.6.2
-e git+https://github.com/pallets-eco/flask-session@a9d001ae9b40268c9189c468bb136e535d3358e1#egg=flask-session
pyyaml>=5.2
rq==1.3.0
rq-dashboard==0.3.4
Expand Down

0 comments on commit d69e4b4

Please sign in to comment.