D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: [Redis conn]

gallypette-patch-1
Terrtia 2019-11-25 17:01:43 +01:00
parent 8f5a084d32
commit 5b0b5a6f68
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/lib/Sensor.py
View File

@ -8,14 +8,14 @@ import redis
from flask import escape from flask import escape
host_redis_metadata = os.getenv('D4_REDIS_METADATA_HOST', "localhost") sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/'))
port_redis_metadata = int(os.getenv('D4_REDIS_METADATA_PORT', 6380)) import ConfigLoader
r_serv_db = redis.StrictRedis( ### Config ###
host=host_redis_metadata, config_loader = ConfigLoader.ConfigLoader()
port=port_redis_metadata, r_serv_db = config_loader.get_redis_conn("Redis_METADATA")
db=0, config_loader = None
decode_responses=True) ### ###
def is_valid_uuid_v4(UUID): def is_valid_uuid_v4(UUID):
UUID = UUID.replace('-', '') UUID = UUID.replace('-', '')

19
server/lib/User.py
View File

@ -2,6 +2,7 @@
# -*-coding:UTF-8 -* # -*-coding:UTF-8 -*
import os import os
import sys
import time import time
import redis import redis
import bcrypt import bcrypt
@ -9,17 +10,21 @@ import random
from flask_login import UserMixin from flask_login import UserMixin
sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/'))
import ConfigLoader
config_loader = ConfigLoader.ConfigLoader()
r_serv_db = config_loader.get_redis_conn("Redis_SERV")
config_loader = None
# CONFIG #
config_loader = ConfigLoader.ConfigLoader()
class User(UserMixin): class User(UserMixin):
def __init__(self, id): def __init__(self, id):
host_redis_metadata = os.getenv('D4_REDIS_METADATA_HOST', "localhost")
port_redis_metadata = int(os.getenv('D4_REDIS_METADATA_PORT', 6380))
self.r_serv_db = redis.StrictRedis( self.r_serv_db = r_serv_db
host=host_redis_metadata,
port=port_redis_metadata,
db=1,
decode_responses=True)
if self.r_serv_db.hexists('user:all', id): if self.r_serv_db.hexists('user:all', id):
self.id = id self.id = id