Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
This commit is contained in:
drigato 2014-11-26 11:54:07 -05:00
commit 477ac337e5
23 changed files with 70 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
View file

@ -27,7 +27,7 @@ QUEUE = "airtime-uploads"
Airtime's music library directory. Lastly, the extracted metadata is
reported back to the Airtime web application.
There's a couple of Very Important technical details and contraints that you
There's a couple of Very Important technical details and constraints that you
need to know if you're going to work on this code:
1) airtime_analyzer is designed so it doesn't have to run on the same

2
python_apps/airtime_analyzer/tools/ftp-upload-hook.sh
View file

@ -18,7 +18,7 @@ post_file() {
airtime_conf_path=/etc/airtime/airtime.conf
#maps the instance_path to the url
vhost_file=/mnt/airtimepro/system/vhost.map
vhost_file=/etc/apache2/airtime/vhost.map
#instance_path will look like 1/1384, for example
instance_path=$(echo ${file_path} | grep -Po "(?<=($base_instance_path)).*?(?=/srv)")