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

Merge branch 'devel' into cc-1960-internationalize-airtime

This commit is contained in:
denise 2012-11-21 17:17:53 -05:00
parent 993d3fda7b 2172ee82d3
commit c0e49b69e2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Preference.php
View File

@ -204,9 +204,9 @@ class Application_Model_Preference
$fade = $out;
}
$fade = number_format($fade, 2);
$fade = number_format($fade, 1);
//fades need 2 leading zeros for DateTime conversion
$fade = str_pad($fade, 5, "0", STR_PAD_LEFT);
$fade = str_pad($fade, 4, "0", STR_PAD_LEFT);
return $fade;
}

5
python_apps/api_clients/api_client.py
View File

@ -136,7 +136,8 @@ class AirtimeApiClient(object):
self.config = ConfigObj(config_path)
self.services = RequestProvider(self.config)
except Exception, e:
self.logger.error('Error loading config file: %s', e)
self.logger.error('Error loading config file: %s', config_path)
self.logger.error('Exception: %s', str(e))
sys.exit(1)
def __get_airtime_version(self):
@ -377,7 +378,7 @@ class AirtimeApiClient(object):
response = self.services.get_stream_parameters()
self.logger.debug(response)
return response
def push_stream_stats(self, data):
# TODO : users of this method should do their own error handling
response = self.services.push_stream_stats(_post_data={'data': json.dumps(data)})