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

chg: [core] add redis server in config

gallypette-patch-1
Terrtia 2019-11-25 16:41:39 +01:00
parent 6f58e862cc
commit 8bf0fe4590
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
server/workers/workers_2/meta_types_modules/MetaTypesDefault.py
View File

@ -8,7 +8,10 @@ import gzip
import redis import redis
import shutil import shutil
import datetime import datetime
import configparser
sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib/'))
import ConfigLoader
DEFAULT_FILE_EXTENSION = 'txt' DEFAULT_FILE_EXTENSION = 'txt'
DEFAULT_FILE_SEPARATOR = b'\n' DEFAULT_FILE_SEPARATOR = b'\n'
@ -16,26 +19,12 @@ ROTATION_SAVE_CYCLE = 300 # seconds
MAX_BUFFER_LENGTH = 100000 MAX_BUFFER_LENGTH = 100000
TYPE = 254 TYPE = 254
host_redis_stream = os.getenv('D4_REDIS_STREAM_HOST', "localhost") # CONFIG #
port_redis_stream = int(os.getenv('D4_REDIS_STREAM_PORT', 6379)) config_loader = ConfigLoader.ConfigLoader()
redis_server_stream = redis.StrictRedis( redis_server_stream = config_loader.get_redis_conn("Redis_STREAM", decode_responses=False)
host=host_redis_stream, redis_server_metadata = config_loader.get_redis_conn("Redis_METADATA", decode_responses=False)
port=port_redis_stream, redis_server_analyzer = config_loader.get_redis_conn("Redis_ANALYZER", decode_responses=False)
db=0)
host_redis_metadata = os.getenv('D4_REDIS_METADATA_HOST', "localhost")
port_redis_metadata = int(os.getenv('D4_REDIS_METADATA_PORT', 6380))
redis_server_metadata = redis.StrictRedis(
host=host_redis_metadata,
port=port_redis_metadata,
db=0)
redis_server_analyzer = redis.StrictRedis(
host=host_redis_metadata,
port=port_redis_metadata,
db=2)
analyzer_list_max_default_size = 10000 analyzer_list_max_default_size = 10000
@ -48,19 +37,17 @@ class MetaTypesDefault:
self.buffer = b'' self.buffer = b''
self.file_rotation_mode = True self.file_rotation_mode = True
# get file config
config_file_server = os.path.join(os.environ['D4_HOME'], 'configs/server.conf')
config_server = configparser.ConfigParser()
config_server.read(config_file_server)
# get data directory # get data directory
use_default_save_directory = config_server['Save_Directories'].getboolean('use_default_save_directory') use_default_save_directory = config_loader.get_config_boolean("Save_Directories", "use_default_save_directory")
# check if field is None # check if field is None
if use_default_save_directory: if use_default_save_directory:
data_directory = os.path.join(os.environ['D4_HOME'], 'data') data_directory = os.path.join(os.environ['D4_HOME'], 'data')
else: else:
data_directory = config_server['Save_Directories'].get('save_directory') data_directory = config_loader.get_config_str("Save_Directories", "save_directory")
self.data_directory = data_directory self.data_directory = data_directory
config_loader = None
self.parse_json(json_file) self.parse_json(json_file)
def test(self): def test(self):