Commit 3cd6f64d authored by Cristian Aguirre's avatar Cristian Aguirre

Merge branch 'developer' into 'developer_ev'

# Conflicts:
#   conf.yml
parents 484f2e4a 008be1de
......@@ -7,7 +7,7 @@ app:
port: 3301
user: root
password: root
db: cusca
db: css_cuscatlan
dialect: 'mysql+pymysql'
# BD conexion configurations
# https://docs.sqlalchemy.org/en/14/core/pooling.html
......@@ -35,10 +35,4 @@ app:
worker_connections: 50
loglevel: 'debug'
accesslog: '-'
capture_output: True
spark:
cores: '*'
memory: 16 # En gb y que sea par, de preferencia 2, 4, 6, 18, 32, etc.
jars_path:
mysql: 'jars/mysql-connector-java-8.0.30.jar'
\ No newline at end of file
capture_output: True
\ No newline at end of file
......@@ -25,11 +25,6 @@ class Config(object):
# Max threads allowed
max_engine_threads = conf["max_engine_threads"]
# Spark config
spark_cores = conf["spark"]["cores"]
spark_mem = conf["spark"]["memory"]
spark_jars = conf["spark"]["jars_path"]
class ProductionConfig(Config):
DEBUG = False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment