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

Fixed the unit tests again

This commit is contained in:
Albert Santoni 2015-02-02 13:31:52 -05:00
parent 9baed1b328
commit e32a26956b
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
View File

@ -1,7 +1,7 @@
import os import os
import logging import logging
import uuid import uuid
import config_file import ConfigParser
from boto.s3.connection import S3Connection from boto.s3.connection import S3Connection
from boto.s3.key import Key from boto.s3.key import Key
@ -25,20 +25,31 @@ class CloudStorageUploader:
def __init__(self): def __init__(self):
config = config_file.read_config_file(CLOUD_CONFIG_PATH) try:
config = ConfigParser.SafeConfigParser()
config.readfp(open(CLOUD_CONFIG_PATH))
cloud_storage_config_section = config.get("current_backend", "storage_backend")
self._storage_backend = cloud_storage_config_section
except IOError as e:
print "Failed to open config file at " + CLOUD_CONFIG_PATH + ": " + e.strerror
print "Defaulting to file storage"
self._storage_backend = STORAGE_BACKEND_FILE
except Exception as e:
print e
print "Defaulting to file storage"
self._storage_backend = STORAGE_BACKEND_FILE
CLOUD_STORAGE_CONFIG_SECTION = config.get("current_backend", "storage_backend")
self._storage_backend = CLOUD_STORAGE_CONFIG_SECTION
if self._storage_backend == STORAGE_BACKEND_FILE: if self._storage_backend == STORAGE_BACKEND_FILE:
self._host = "" self._host = ""
self._bucket = "" self._bucket = ""
self._api_key = "" self._api_key = ""
self._api_key_secret = "" self._api_key_secret = ""
else: else:
self._host = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'host') self._host = config.get(cloud_storage_config_section, 'host')
self._bucket = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'bucket') self._bucket = config.get(cloud_storage_config_section, 'bucket')
self._api_key = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key') self._api_key = config.get(cloud_storage_config_section, 'api_key')
self._api_key_secret = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key_secret') self._api_key_secret = config.get(cloud_storage_config_section, 'api_key_secret')
def enabled(self): def enabled(self):
if self._storage_backend == "file": if self._storage_backend == "file":

26
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader_libcloud.py
View File

@ -1,7 +1,7 @@
import os import os
import logging import logging
import uuid import uuid
import config_file import ConfigParser
from libcloud.storage.providers import get_driver from libcloud.storage.providers import get_driver
from libcloud.storage.types import Provider, ContainerDoesNotExistError, ObjectDoesNotExistError from libcloud.storage.types import Provider, ContainerDoesNotExistError, ObjectDoesNotExistError
@ -27,20 +27,30 @@ class CloudStorageUploader:
def __init__(self): def __init__(self):
config = config_file.read_config_file(CLOUD_CONFIG_PATH) config = ConfigParser.SafeConfigParser()
try:
config.readfp(open(CLOUD_CONFIG_PATH))
cloud_storage_config_section = config.get("current_backend", "storage_backend")
self._storage_backend = cloud_storage_config_section
except IOError as e:
print "Failed to open config file at " + CLOUD_CONFIG_PATH + ": " + e.strerror
print "Defaulting to file storage"
self._storage_backend = STORAGE_BACKEND_FILE
except Exception as e:
print e
print "Defaulting to file storage"
self._storage_backend = STORAGE_BACKEND_FILE
CLOUD_STORAGE_CONFIG_SECTION = config.get("current_backend", "storage_backend")
self._storage_backend = CLOUD_STORAGE_CONFIG_SECTION
if self._storage_backend == STORAGE_BACKEND_FILE: if self._storage_backend == STORAGE_BACKEND_FILE:
self._provider = "" self._provider = ""
self._bucket = "" self._bucket = ""
self._api_key = "" self._api_key = ""
self._api_key_secret = "" self._api_key_secret = ""
else: else:
self._provider = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'provider') self._provider = config.get(cloud_storage_config_section, 'provider')
self._bucket = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'bucket') self._bucket = config.get(cloud_storage_config_section, 'bucket')
self._api_key = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key') self._api_key = config.get(cloud_storage_config_section, 'api_key')
self._api_key_secret = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key_secret') self._api_key_secret = config.get(cloud_storage_config_section, 'api_key_secret')
def enabled(self): def enabled(self):
if self._storage_backend == "file": if self._storage_backend == "file":