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

View File

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

View File

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