summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--windriver/docker/Dockerfile1
-rw-r--r--windriver/requirements.txt2
-rw-r--r--windriver/run.sh5
-rw-r--r--windriver/titanium_cloud/__init__.py7
-rw-r--r--windriver/titanium_cloud/celery.py38
5 files changed, 53 insertions, 0 deletions
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index 82e669e0..745eba93 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -19,6 +19,7 @@ EXPOSE 9005
# COPY ./ /opt/windriver/
RUN apt-get update && \
apt-get install -y memcached && \
+ apt-get install -y rabbitmq-server && \
apt-get install -y unzip && \
cd /opt/ && \
wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=LATEST" && \
diff --git a/windriver/requirements.txt b/windriver/requirements.txt
index 3d769c15..cec3a5ef 100644
--- a/windriver/requirements.txt
+++ b/windriver/requirements.txt
@@ -22,3 +22,5 @@ unittest_xml_reporting==1.12.0
# for onap logging
onappylog>=1.0.6
+# for background tasks
+celery >= 4.0
diff --git a/windriver/run.sh b/windriver/run.sh
index 4cc23a60..8729584e 100644
--- a/windriver/run.sh
+++ b/windriver/run.sh
@@ -15,6 +15,11 @@
memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
export PYTHONPATH=lib/share
+
+service rabbitmq-server restart
+# make sure only 1 worker due to missing the synchronization between workers now
+nohup celery -A titanium_cloud worker --concurrency=1 --loglevel=debug &
+
#nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
nohup uwsgi --http :9005 --module titanium_cloud.wsgi --master --processes 4 &
diff --git a/windriver/titanium_cloud/__init__.py b/windriver/titanium_cloud/__init__.py
index afa702d3..e9fe5d03 100644
--- a/windriver/titanium_cloud/__init__.py
+++ b/windriver/titanium_cloud/__init__.py
@@ -12,3 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import, unicode_literals
+
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app
+
+__all__ = ['celery_app'] \ No newline at end of file
diff --git a/windriver/titanium_cloud/celery.py b/windriver/titanium_cloud/celery.py
new file mode 100644
index 00000000..368c5ddb
--- /dev/null
+++ b/windriver/titanium_cloud/celery.py
@@ -0,0 +1,38 @@
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import absolute_import, unicode_literals
+import os
+from celery import Celery
+import logging
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'titanium_cloud.settings')
+
+app = Celery('titanium_cloud')
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
+# - namespace='CELERY' means all celery-related configuration keys
+# should have a `CELERY_` prefix.
+app.config_from_object('django.conf:settings', namespace='CELERY')
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()
+
+logger = logging.getLogger(__name__)
+
+@app.task(bind=True)
+def debug_task(self):
+ logger.debug("self.request")