Request logic settings and improvements. Preparing to merge back to master

Author: 20

app/django-bbx/bbx/settings.example.py

@@ -14,6 +14,16 @@
 # Example: "/var/www/example.com/media/"
 MEDIA_ROOT = "/data/bbx/"
 
+## Broker settings.
+BROKER_URL = 'amqp://guest:guest@localhost:5672//'
+
+# List of modules to import when celery starts.
+CELERY_IMPORTS = ('repository.tasks',)
+
+## Using the database to store task state and results.
+CELERY_RESULT_BACKEND = 'amqp'
+CELERY_TASK_RESULT_EXPIRES = 18000  # 5 hours.   
+
 # Change this to the full path to your own repository
 REPOSITORY_DIR_NAME ="repositories"
 REPOSITORY_DIR = os.path.join(MEDIA_ROOT, REPOSITORY_DIR_NAME)

app/django-bbx/mocambola/models.py

@@ -103,7 +103,8 @@ def mocambola_post_save(instance, **kwargs):
     fout.close()
     git_add(mocamboladata, mocambolapath)
     git_commit(mocamboladata, instance.user.get_username(),
-              instance.user.email, instance.repository.get_path())
+               instance.user.email, instance.repository.get_path(),
+               os.path.join(mocambolapath, mocamboladata))
 
 # TODO HIGH: Precisa serializar o user tambem na criaçao e update
 # diretamente pelo usuario

app/django-bbx/repository/models.py

@@ -40,10 +40,10 @@ def git_media_post_save(instance, **kwargs):
     fout.close()
     git_add(mediadata, mediapath)
     git_commit(instance.get_file_name(),
-              instance.author.username,
-              instance.author.email,
-              get_file_path(instance))
-
+               instance.author.username,
+               instance.author.email,
+               get_file_path(instance),
+               os.path.join(mediapath, mediadata))
 
 
 def get_default_repository():
@@ -141,12 +141,12 @@ def git_rm(file_name, repository_path):
     pipe = subprocess.Popen(cmd, shell=True, cwd=repository_path)
     pipe.wait()
 
-def git_commit(file_title, author_name, author_email, repository_path):
+def git_commit(file_title, author_name, author_email, repository_path, file_path):
     u"""Executa o *commit* no repositório impostando os dados do author."""
     logger.info('git commit --author="' + author_name + ' <' + author_email +
                 '>" -m "' + file_title + '"')
     cmd = ('git commit --author="' + author_name + ' <' + author_email +
-           '>" -m "' + file_title + '"')
+           '>" -m "' + file_title + '" -- ' + file_path)
     pipe = subprocess.Popen(cmd, shell=True, cwd=repository_path)
     pipe.wait()
 
@@ -220,11 +220,8 @@ def git_annex_copy_to(repository_path):
 def git_annex_where_is(media):
     u"""Mostra quais mucuas tem copia do media."""
     cmd = 'git annex whereis ' + media.get_file_name() + ' --json'
-    logger.debug('Whereis filepath: ' + get_file_path(media) + media.get_file_name())
     pipe = subprocess.Popen(cmd, shell=True, cwd=get_file_path(media), stdout=subprocess.PIPE)
     output, error = pipe.communicate()
-    logger.debug(error)
-    logger.info(output)
     return output
 
 def git_annex_drop(media):

bin/process-requests.sh.example

@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Para rodar esse script a cada minuto digitar
+# crontab -e
+# e colocar a linha:
+# */1 * * * * * /srv/bbx/bin/process-requests.sh
+
+. /srv/bbx/envs/bbx/bin/activate
+python /srv/bbx/baobaxia/app/django-bbx/manage.py process_requests mocambos `hostname`
+

conf/supervisor/celeryd

@@ -0,0 +1,16 @@
+[program:celery]
+; Set full path to celery program if using virtualenv
+command=/srv/bbx/envs/bbx/bin/celery worker -A bbx --loglevel=INFO
+directory=/srv/bbx/baobaxia/app/django-bbx
+user=exu
+numprocs=1
+stdout_logfile=/srv/bbx/log/celery/worker.log
+stderr_logfile=/srv/bbx/log/celery/worker_error.log
+autostart=true
+autorestart=true
+startsecs=10
+
+environment = 
+	    DJANGO_SETTINGS_MODULE=bbx.settings
+
+; PYTHONPATH="/srv/bbx/envs/bbx/",

install.sh

@@ -31,14 +31,9 @@ create_user() {
 # PRE: pkgs:
 
 # dependencies: se for deb pkg, tirar
-<<<<<<< HEAD
-apt-get install git git-annex nginx supervisor python-pip rabbitmq-server
-=======
-apt-get install git git-annex nginx supervisor python-pip libjpeg-dev libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev python-setuptools
+apt-get install git git-annex nginx supervisor python-pip rabbitmq-server libjpeg-dev libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev python-setuptools
 
 
->>>>>>> master
-
 ### cria diretorio basico
 mkdir -p $DEFAULT_REPOSITORY_DIR
 
@@ -251,19 +246,7 @@ su - $USER_BBX -c "
 virtualenv $INSTALL_DIR/envs/bbx ;
 . $INSTALL_DIR/envs/bbx/bin/activate ;
 pip install --upgrade setuptools ;
-<<<<<<< HEAD
 cd $INSTALL_DIR;
-tar xjvf pip_wheel_20140606.tbz ;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/argparse-1.2.1-py2-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/Django-1.6.5-py2.py3-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/django_extensions-1.1.1-py2-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/djangorestframework-2.3.6-py2-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/gunicorn-18.0-py2-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/six-1.3.0-py2-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/sorl_thumbnail-11.12.1b-py27-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/South-0.8.4-py2.py3-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/wheel-0.23.0-py2.py3-none-any.whl;
-# pip install --use-wheel --no-index --find-links=local/wheel local/wheel/wsgiref-0.1.2-py2-none-any.whl;
 pip install argparse;
 pip install django==1.6.7;
 pip install django-extensions;
@@ -274,21 +257,8 @@ pip install sorl-thumbnail;
 pip install south;
 pip install wheel;
 pip install wsgiref;
-pip install longerusername
-=======
-pip install Django==1.6.6 ;
-pip install Pillow==2.6.1 ;
-pip install South==1.0 ;
-pip install argparse==1.2.1 ;
-pip install django-extensions==1.3.11 ;
-pip install djangorestframework==2.3.14 ;
-pip install gunicorn==19.1.1 ;
-pip install longerusername==0.4 ;
-pip install six==1.7.3 ;
-pip install sorl-thumbnail==11.12 ;
-pip install wheel==0.24.0 ;
-pip install wsgiref==0.1.2 ;
->>>>>>> master
+pip install longerusername;
+pip install celery
 "
 
 echo ""
@@ -349,22 +319,29 @@ echo "Ativando NGINX ..."
 service nginx restart
 
 echo ""
-echo "Criando arquivo de configuração do Supervisor ..."
+echo "Criando arquivo de configuração do Supervisor para BBX..."
 cp $INSTALL_DIR/baobaxia/conf/supervisor/bbx /etc/supervisor/conf.d/bbx.conf
 sed -i "s:_domain_:${BBX_DIR_NAME}:g" /etc/supervisor/conf.d/bbx.conf
 
+echo ""
+echo "Criando arquivo de configuração do Supervisor para Celery..."
+cp $INSTALL_DIR/baobaxia/conf/supervisor/celeryd /etc/supervisor/conf.d/celeryd.conf
+
 echo ""
 echo "Ativando o Baobáxia ..."
 supervisorctl reload
 supervisorctl restart bbx
+supervisorctl restart celeryd
 
-#echo ""
-#echo "Ativando a sincronização (bbx-cron) ..."
-#cp $INSTALL_DIR/baobaxia/bin/bbx-cron.sh.example $INSTALL_DIR/bin/bbx-cron.sh
-#chmod +x $INSTALL_DIR/bin/bbx-cron.sh
-#touch /etc/cron.d/bbx
-#printf "# Sincronização do Baobáxia \n" >> /etc/cron.d/bbx
-#printf "*/30 * * * * * exu bash /srv/bbx/bin/bbx-cron.sh \n" >> /etc/cron.d/bbx
+echo ""
+echo "Instalando script de sincronização (bbx-cron) ..."
+cp $INSTALL_DIR/baobaxia/bin/bbx-cron.sh.example $INSTALL_DIR/bin/bbx-cron.sh
+chmod +x $INSTALL_DIR/bin/bbx-cron.sh
+
+echo ""
+echo "Instalando script para pedidos de arquivos (process-requests) ..."
+cp $INSTALL_DIR/baobaxia/bin/process-requests.sh.example $INSTALL_DIR/bin/process-requests.sh
+chmod +x $INSTALL_DIR/bin/process-requests.sh
 
 echo "..."
 echo "Instalação completa!"