diff --git a/paramecio/citoplasma/sessions.py b/paramecio/citoplasma/sessions.py index cd9d875..61a404f 100644 --- a/paramecio/citoplasma/sessions.py +++ b/paramecio/citoplasma/sessions.py @@ -165,125 +165,6 @@ elif config.session_opts['session.type']=='redis': pass else: - """ - def generate_session(): - - if config.cookie_name in request.environ: - - request.environ[config.cookie_name].invalidate() - - else: - - request.environ[config.cookie_name]=request.environ.get(config.cookie_name, {}) - - return request.environ[config.cookie_name] - - def regenerate_session(): - - if config.cookie_name in request.environ: - - request.environ[config.cookie_name].invalidate() - - else: - - request.environ[config.cookie_name]=request.environ.get(config.cookie_name, {}) - - return request.environ[config.cookie_name] - - def get_session(): - print(request.environ.keys()) - if config.cookie_name in request.environ: - - return request.environ[config.cookie_name] - - else: - return {} - """ - """ - secret=JSONWebSignatureSerializer(config.key_encrypt) - - def generate_session(): - - token=create_key(30).replace('/', '#') - - session={'token': token} - - s=secret.dumps(session) - try: - response.set_cookie(config.cookie_name, session, path=config.session_opts['session.path']) - - request.environ['session']=s - - except: - pass - - return session - - def regenerate_session(): - - s=generate_session() - - return ParamecioSession(s) - - def load_session(cookie): - - try: - s=secret.loads(cookie) - - except: - s={} - - return s - - def save_session(cookie, session): - generate_session(session) - """ - """ - def generate_session(session={}): - - #secret=URLSafeSerializer(config.key_encrypt) - - #session=secret.dumps(session) - - token=create_key(30).replace('/', '#') - - s={'token': token} - - response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path']) - - request.environ['session']=s - - return s - - def regenerate_session(): - - token=create_key(30).replace('/', '#') - - s={'token': token} - - response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path']) - - return ParamecioSession(s) - - - cache=Cache(config.session_opts['session.data_dir']) - - def load_session(token): - - # Here get the function for load session - - if token in cache: - s=json.loads(cache[token]) - else: - s={'token': token} - cache.add(token, json.dumps(s)) - - return s - - def save_session(token, session): - - cache[token]=json.dumps(session) - """ def generate_session(session={}): @@ -359,78 +240,3 @@ else: json_session=json.dumps(session) f.write(json_session) - - """ - region = make_region().configure( - 'dogpile.cache.dbm', - expiration_time = 3600, - arguments = { - "filename":config.session_opts['session.data_dir']+"/sessions.dbm" - } - ) - - def create_value(): - return False - def load_session(token): - - # Here get the function for load session - - json_s=region.get_or_create(token, create_value) - - if json_s: - s=json.loads(json_s) - else: - s={'token': token} - region.set(token, json.dumps(s)) - - return s - - def save_session(token, session): - - #cache[token]=json.dumps(session) - region.set(token, json.dumps(session)) - """ - - -""" -def generate_session(): - s=request.environ.get(config.cookie_name) - s.invalidate() - -def get_session(): - - try: - - if config.cookie_name in request.environ: - - return request.environ.get(config.cookie_name) - #ParamecioSession() - else: - return ParamecioSession({}) - - except: - - return ParamecioSession({}) -""" -""" - try: - - # Check if session was loaded, if loaded, get cache - - #return request.environ.get(config.cookie_name) - code_session=request.get_cookie(config.cookie_name) - - try: - - #with fopen(config.session_opts['session.data_dir']) as signed_session: - pass - - - except: - - return {} - - except: - - return {} - """ diff --git a/paramecio/cromosoma/databases/sqlalchemy.py b/paramecio/cromosoma/databases/sqlalchemy.py index 81c93aa..c935408 100644 --- a/paramecio/cromosoma/databases/sqlalchemy.py +++ b/paramecio/cromosoma/databases/sqlalchemy.py @@ -50,7 +50,7 @@ class SqlClass: import MySQLdb.cursors SqlClass.cursors_connect=MySQLdb.cursors.DictCursor - engine=create_engine("mysql+%s://%s:%s@%s/%s?charset=utf8mb4" % (self.connection['db_type'], self.connection['user'], self.connection['password'], self.connection['host'], self.connection['db']), pool_recycle=self.pool_recycle, echo_pool=True, pool_size=self.pool_size) + engine=create_engine("mysql+%s://%s:%s@%s/%s?charset=utf8mb4" % (self.connection['db_type'], self.connection['user'], self.connection['password'], self.connection['host'], self.connection['db']), pool_recycle=self.pool_recycle, echo_pool=True, pool_size=self.pool_size, pool_pre_ping=True) except: e = sys.exc_info()[0] @@ -64,7 +64,7 @@ class SqlClass: self.conn=engine.raw_connection() - self.conn.ping(True) + #self.conn.ping(True) else: @@ -81,7 +81,7 @@ class SqlClass: passwd=self.connection['password'], db=self.connection['db'], charset='utf8mb4', - cursorclass=MySQLdb.cursors.DictCursor) + cursorclass=pymysql.cursors.DictCursor) else: