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

Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-04-04 15:14:04 -04:00
parent 6c0b0f7732 301115c035
commit a061464ffb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View File

@ -746,7 +746,7 @@ class ApiController extends Zend_Controller_Action
{ {
$request = $this->getRequest(); $request = $this->getRequest();
$msg = $request->getParam('msg'); $msg = $request->getParam('msg_post');
$stream_id = $request->getParam('stream_id'); $stream_id = $request->getParam('stream_id');
$boot_time = $request->getParam('boot_time'); $boot_time = $request->getParam('boot_time');

6
python_apps/api_clients/api_client.py
View File

@ -364,8 +364,12 @@ class AirtimeApiClient(object):
def notify_liquidsoap_status(self, msg, stream_id, time): def notify_liquidsoap_status(self, msg, stream_id, time):
logger = self.logger logger = self.logger
try: try:
post_data = {"msg": msg} post_data = {"msg_post": msg}
#encoded_msg is no longer used server_side!!
encoded_msg = urllib.quote('dummy')
self.services.update_liquidsoap_status.req(post_data, self.services.update_liquidsoap_status.req(post_data,
msg=encoded_msg,
stream_id=stream_id, stream_id=stream_id,
boot_time=time).retry(5) boot_time=time).retry(5)
except Exception, e: except Exception, e: