Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

Commit

Permalink
chore: merge last fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@obdulia-losantos
obdulia-losantos authored Apr 24, 2020
2 parents 08f1108 + 61ae44a commit f46e508
Show file tree
Hide file tree
Showing 12 changed files with 126 additions and 90 deletions.
46 changes: 23 additions & 23 deletions aether-kernel/conf/pip/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
aether.python==1.0.17
aether.sdk==1.2.21
attrs==19.3.0
autopep8==1.5
boto3==1.12.22
botocore==1.15.22
cachetools==4.0.0
certifi==2019.11.28
autopep8==1.5.2
boto3==1.12.45
botocore==1.15.45
cachetools==4.1.0
certifi==2020.4.5.1
cffi==1.14.0
chardet==3.0.4
configparser==4.0.2
configparser==5.0.0
coreapi==2.3.3
coreschema==0.0.4
coverage==5.0.4
cryptography==2.8
coverage==5.1
cryptography==2.9.2
decorator==4.4.2
Django==2.2.11
Django==2.2.12
django-autofixture==0.12.1
django-cacheops==4.2
django-cleanup==4.0.0
Expand All @@ -50,43 +50,43 @@ eha-jsonpath==0.5.1
entrypoints==0.3
et-xmlfile==1.0.1
flake8==3.7.9
flake8-quotes==2.1.1
flake8-quotes==3.0.0
funcy==1.14
google-api-core==1.16.0
google-auth==1.11.3
google-api-core==1.17.0
google-auth==1.14.1
google-cloud-core==1.3.0
google-cloud-storage==1.26.0
google-cloud-storage==1.28.0
google-resumable-media==0.5.0
googleapis-common-protos==1.51.0
gprof2dot==2019.11.30
idna==2.9
importlib-metadata==1.5.0
inflection==0.3.1
itypes==1.1.0
importlib-metadata==1.6.0
inflection==0.4.0
itypes==1.2.0
jdcal==1.4.1
Jinja2==2.11.1
Jinja2==2.11.2
jmespath==0.9.5
jsonpath-ng==1.5.1
jsonschema==3.2.0
lxml==4.5.0
MarkupSafe==1.1.1
mccabe==0.6.1
minio==5.0.8
minio==5.0.10
openpyxl==3.0.3
packaging==20.3
ply==3.11
prometheus-client==0.7.1
protobuf==3.11.3
psycopg2-binary==2.8.4
psycopg2-binary==2.8.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.5.0
pycparser==2.20
pyflakes==2.1.1
Pygments==2.6.1
pyOpenSSL==19.1.0
pyparsing==2.4.6
pyrsistent==0.15.7
pyparsing==2.4.7
pyrsistent==0.16.0
python-dateutil==2.8.1
python-json-logger==0.1.11
pytz==2019.3
Expand All @@ -96,12 +96,12 @@ rsa==4.0
ruamel.yaml==0.16.10
ruamel.yaml.clib==0.2.0
s3transfer==0.3.3
sentry-sdk==0.14.2
sentry-sdk==0.14.3
six==1.14.0
spavro==1.1.23
sqlparse==0.3.1
tblib==1.6.0
uritemplate==3.0.1
urllib3==1.25.8
urllib3==1.25.9
uWSGI==2.0.18
zipp==3.1.0
11 changes: 11 additions & 0 deletions aether-kernel/conf/uwsgi/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if-env = UWSGI_PROCESSES
processes = $(UWSGI_PROCESSES)
endif =

enable-threads = true
threads = %k
if-env = UWSGI_THREADS
threads = $(UWSGI_THREADS)
Expand Down Expand Up @@ -46,6 +47,7 @@ log-5xx = true

http = 0.0.0.0:$(WEB_SERVER_PORT)


# ------------------------------------------------------------------------------
if-env = CUSTOM_UWSGI_SERVE_STATIC
static-expires = /* 7776000
Expand All @@ -66,5 +68,14 @@ close-on-exec = true
# http://uwsgi-docs.readthedocs.org/en/latest/articles/SerializingAccept.html
thunder-lock = true

# https://www.techatbloomberg.com/blog/configuring-uwsgi-production-deployment/
strict = true
need-app = true
single-interpreter = true

max-requests = 1000 ; Restart workers after this many requests
max-worker-lifetime = 3600 ; Restart workers after this many seconds
reload-on-rss = 2048 ; Restart workers after this much resident memory
worker-reload-mercy = 60 ; How long to wait before forcefully killing workers

# https://uwsgi-docs.readthedocs.io/
36 changes: 18 additions & 18 deletions aether-odk-module/conf/pip/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
################################################################################

aether.sdk==1.2.21
autopep8==1.5
boto3==1.12.22
botocore==1.15.22
cachetools==4.0.0
certifi==2019.11.28
autopep8==1.5.2
boto3==1.12.45
botocore==1.15.45
cachetools==4.1.0
certifi==2020.4.5.1
cffi==1.14.0
chardet==3.0.4
configparser==4.0.2
coverage==5.0.4
cryptography==2.8
Django==2.2.11
configparser==5.0.0
coverage==5.1
cryptography==2.9.2
Django==2.2.12
django-cacheops==4.2
django-cleanup==4.0.0
django-cors-headers==3.2.1
Expand All @@ -39,27 +39,27 @@ docutils==0.15.2
drf-dynamic-fields==0.3.1
entrypoints==0.3
flake8==3.7.9
flake8-quotes==2.1.1
flake8-quotes==3.0.0
FormEncode==1.3.1
funcy==1.14
google-api-core==1.16.0
google-auth==1.11.3
google-api-core==1.17.0
google-auth==1.14.1
google-cloud-core==1.3.0
google-cloud-storage==1.26.0
google-cloud-storage==1.28.0
google-resumable-media==0.5.0
googleapis-common-protos==1.51.0
gprof2dot==2019.11.30
idna==2.9
Jinja2==2.11.1
Jinja2==2.11.2
jmespath==0.9.5
linecache2==1.0.0
lxml==4.5.0
MarkupSafe==1.1.1
mccabe==0.6.1
minio==5.0.8
minio==5.0.10
prometheus-client==0.7.1
protobuf==3.11.3
psycopg2-binary==2.8.4
psycopg2-binary==2.8.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.5.0
Expand All @@ -75,14 +75,14 @@ redis==3.4.1
requests==2.23.0
rsa==4.0
s3transfer==0.3.3
sentry-sdk==0.14.2
sentry-sdk==0.14.3
six==1.14.0
spavro==1.1.23
sqlparse==0.3.1
tblib==1.6.0
traceback2==1.4.0
unicodecsv==0.14.1
unittest2==1.1.0
urllib3==1.25.8
urllib3==1.25.9
uWSGI==2.0.18
xlrd==1.2.0
10 changes: 10 additions & 0 deletions aether-odk-module/conf/uwsgi/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if-env = UWSGI_PROCESSES
processes = $(UWSGI_PROCESSES)
endif =

enable-threads = true
threads = %k
if-env = UWSGI_THREADS
threads = $(UWSGI_THREADS)
Expand Down Expand Up @@ -67,5 +68,14 @@ close-on-exec = true
# http://uwsgi-docs.readthedocs.org/en/latest/articles/SerializingAccept.html
thunder-lock = true

# https://www.techatbloomberg.com/blog/configuring-uwsgi-production-deployment/
strict = true
need-app = true
single-interpreter = true

max-requests = 1000 ; Restart workers after this many requests
max-worker-lifetime = 3600 ; Restart workers after this many seconds
reload-on-rss = 2048 ; Restart workers after this much resident memory
worker-reload-mercy = 60 ; How long to wait before forcefully killing workers

# https://uwsgi-docs.readthedocs.io/
28 changes: 14 additions & 14 deletions aether-producer/conf/pip/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,41 @@
################################################################################

attrs==19.3.0
certifi==2019.11.28
certifi==2020.4.5.1
cffi==1.14.0
chardet==3.0.4
click==7.1.1
confluent-kafka==1.3.0
cryptography==2.8
confluent-kafka==1.4.1
cryptography==2.9.2
entrypoints==0.3
flake8==3.7.9
flake8-quotes==2.1.1
Flask==1.1.1
gevent==1.4.0
flake8-quotes==3.0.0
Flask==1.1.2
gevent==20.4.0
greenlet==0.4.15
idna==2.9
importlib-metadata==1.5.0
importlib-metadata==1.6.0
itsdangerous==1.1.0
Jinja2==2.11.1
Jinja2==2.11.2
MarkupSafe==1.1.1
mccabe==0.6.1
more-itertools==8.2.0
packaging==20.3
pluggy==0.13.1
psycogreen==1.0.2
psycopg2-binary==2.8.4
psycopg2-binary==2.8.5
py==1.8.1
pycodestyle==2.5.0
pycparser==2.20
pyflakes==2.1.1
pyOpenSSL==19.1.0
pyparsing==2.4.6
pyparsing==2.4.7
pytest==5.4.1
requests==2.23.0
six==1.14.0
spavro==1.1.23
SQLAlchemy==1.3.15
urllib3==1.25.8
wcwidth==0.1.8
Werkzeug==1.0.0
SQLAlchemy==1.3.16
urllib3==1.25.9
wcwidth==0.1.9
Werkzeug==1.0.1
zipp==3.1.0
2 changes: 1 addition & 1 deletion aether-producer/producer/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(self):
self.killed = False
signal.signal(signal.SIGTERM, self.kill)
signal.signal(signal.SIGINT, self.kill)
gevent.signal(signal.SIGTERM, self.kill)
gevent.signal_handler(signal.SIGTERM, self.kill)

# Turn on Flask Endpoints
# Get Auth details from env
Expand Down
7 changes: 6 additions & 1 deletion aether-producer/producer/db.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ def __init__(self, pg_creds, name, max_connections=1):
self.job_queue = PriorityQueue()
self.connection_pool = Queue()
self.running = True
gevent.signal(signal.SIGTERM, self._kill)
# Start Signal Handlers
self.killed = False
signal.signal(signal.SIGTERM, self._kill)
signal.signal(signal.SIGINT, self._kill)
gevent.signal_handler(signal.SIGTERM, self._kill)

self._start_workers()

def _start_workers(self):
Expand Down
4 changes: 2 additions & 2 deletions aether-ui/aether/ui/assets/css/base/_fonts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


/* Font Awesome 5 https://fontawesome.com/ */
@import url('https://use.fontawesome.com/releases/v5.12.1/css/fontawesome.css');
@import url('https://use.fontawesome.com/releases/v5.12.1/css/solid.css');
@import url('https://use.fontawesome.com/releases/v5.13.0/css/fontawesome.css');
@import url('https://use.fontawesome.com/releases/v5.13.0/css/solid.css');

// sass-lint:disable no-url-domains no-url-protocols
20 changes: 10 additions & 10 deletions aether-ui/aether/ui/assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"avsc": "~5.4.0",
"bootstrap": "~4.4.0",
"html5shiv": "~3.7.0",
"jquery": "~3.4.0",
"jquery": "~3.5.0",
"moment": "~2.24.0",
"popper.js": "~1.16.0",
"react": "~16.13.0",
"react-clipboard.js": "~2.0.16",
"react-dom": "~16.13.0",
"react-intl": "~4.1.0",
"react-intl": "~4.5.0",
"react-outside-click-handler": "~1.3.0",
"react-redux": "~7.2.0",
"react-router-dom": "~5.1.0",
Expand All @@ -40,28 +40,28 @@
"whatwg-fetch": "~3.0.0"
},
"devDependencies": {
"@babel/core": "~7.8.0",
"@babel/core": "~7.9.0",
"@babel/plugin-proposal-class-properties": "~7.8.0",
"@babel/preset-env": "~7.8.0",
"@babel/preset-react": "~7.8.0",
"@babel/preset-env": "~7.9.0",
"@babel/preset-react": "~7.9.0",
"@hot-loader/react-dom": "~16.13.0",
"babel-loader": "~8.0.0",
"css-loader": "~3.4.0",
"babel-loader": "~8.1.0",
"css-loader": "~3.5.0",
"enzyme": "~3.11.0",
"enzyme-adapter-react-16": "~1.15.0",
"express": "~4.17.0",
"jest": "~25.1.0",
"jest": "~25.4.0",
"mini-css-extract-plugin": "~0.9.0",
"nock": "~12.0.0",
"node-fetch": "~2.6.0",
"node-sass": "~4.13.0",
"node-sass": "~4.14.0",
"react-hot-loader": "~4.12.0",
"redux-devtools-extension": "~2.13.0",
"sass-lint": "~1.13.1",
"sass-loader": "~8.0.0",
"standard": "~14.3.0",
"style-loader": "~1.1.0",
"webpack": "~4.42.0",
"webpack": "~4.43.0",
"webpack-bundle-tracker": "~0.4.3",
"webpack-cli": "~3.3.0",
"webpack-dev-middleware": "~3.7.0",
Expand Down
Loading

0 comments on commit f46e508

Please sign in to comment.