* Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest

* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
This commit is contained in:
Duncan Sommerville 2015-10-29 17:53:45 -04:00
parent c92eceb60d
commit e3feb17f0c
12 changed files with 34 additions and 17 deletions

View file

@ -374,10 +374,10 @@ var AIRTIME = (function(AIRTIME) {
//buildEditMetadataDialog(json);
});
} else if (data.ftype === "playlist" || data.ftype === "block") {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl + 'playlist/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl + 'playlist/edit');
AIRTIME.playlist.validatePlaylistElements();
} else if (data.ftype === "stream") {
AIRTIME.playlist.fnEdit(data.id, data.ftype, baseUrl + 'webstream/edit');
AIRTIME.playlist.fnEdit(data.id, data.tr_id, baseUrl + 'webstream/edit');
}
});
});