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

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

Browse source
This commit is contained in:
drigato 2014-11-07 12:35:23 -05:00
commit 4b10e024da
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/airtime/CloudFile.php
View file

@ -41,7 +41,7 @@ class CloudFile extends BaseCloudFile
$scheme = $endpoint->getScheme();
$host = $endpoint->getHost();
$s3_bucket = $amazon_s3->getBucket();
return "$scheme://$host/$s3_bucket/".utf8_encode($resource_id);
return "$scheme://$s3_bucket.$host/".utf8_encode($resource_id);
}
/**

2
python_apps/pypo/cloud_storage_downloader.py
View file

@ -7,7 +7,7 @@ import hashlib
from libcloud.storage.types import Provider, ObjectDoesNotExistError
from libcloud.storage.providers import get_driver
CONFIG_PATH = '/etc/airtime/airtime.conf'
CONFIG_PATH = '/etc/airtime-saas/amazon.conf'
class CloudStorageDownloader:
""" A class that uses Apache Libcloud's Storage API to download objects from