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

Adding back analyzer deadlock workaround. 

Removing command to delete empty sub folders inside organize.
This commit is contained in:
drigato 2014-05-07 15:01:31 -04:00
parent 81dd1deba3
commit c291439483
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -252,8 +252,8 @@ class Rest_MediaController extends Zend_Rest_Controller
$file->setDbMtime($now); $file->setDbMtime($now);
$file->save(); $file->save();
$this->removeEmptySubFolders( /* $this->removeEmptySubFolders(
isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/"); isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/"); */
$this->getResponse() $this->getResponse()
->setHttpResponseCode(200) ->setHttpResponseCode(200)

2
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
View File

@ -34,7 +34,7 @@ class AnalyzerPipeline:
# It is super critical to initialize a separate log file here so that we # It is super critical to initialize a separate log file here so that we
# don't inherit logging/locks from the parent process. Supposedly # don't inherit logging/locks from the parent process. Supposedly
# this can lead to Bad Things (deadlocks): http://bugs.python.org/issue6721 # this can lead to Bad Things (deadlocks): http://bugs.python.org/issue6721
#AnalyzerPipeline.python_logger_deadlock_workaround() AnalyzerPipeline.python_logger_deadlock_workaround()
try: try:
if not isinstance(queue, multiprocessing.queues.Queue): if not isinstance(queue, multiprocessing.queues.Queue):