Merge branch '1.9.1' into devel
Conflicts: airtime_mvc/application/controllers/LibraryController.php python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
This commit is contained in:
commit
cb3060623c
|
@ -219,6 +219,7 @@ class LibraryController extends Zend_Controller_Action
|
|||
Logging::log($data['MDATA_KEY_FILEPATH']);
|
||||
Application_Model_RabbitMq::SendMessageToMediaMonitor("md_update", $data);
|
||||
|
||||
|
||||
$this->_helper->redirector('index');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -129,9 +129,9 @@ AirtimeInstall::InstallStorageDirectory();
|
|||
|
||||
if ($db_install) {
|
||||
if($newInstall) {
|
||||
// This is called with "system" so that we can pass in a parameter. See the file itself
|
||||
// This is called with "passthru" so that we can pass in a parameter. See the file itself
|
||||
// for why we need to do this.
|
||||
system('php '.__DIR__.'/airtime-db-install.php y');
|
||||
passthru('php '.__DIR__.'/airtime-db-install.php y');
|
||||
AirtimeInstall::DbConnect(true);
|
||||
} else {
|
||||
require_once('airtime-db-install.php');
|
||||
|
|
|
@ -38,7 +38,6 @@ class AirtimeProcessEvent(ProcessEvent):
|
|||
self.api_client = api_client
|
||||
self.create_dict = {}
|
||||
|
||||
|
||||
def add_filepath_to_ignore(self, filepath):
|
||||
self.ignore_event.add(filepath)
|
||||
|
||||
|
@ -110,7 +109,6 @@ class AirtimeProcessEvent(ProcessEvent):
|
|||
# detele corresponding entry from create_dict
|
||||
self.create_dict.pop(event.pathname)
|
||||
self.handle_created_file(event.dir, event.pathname, event.name)
|
||||
|
||||
|
||||
def handle_created_file(self, dir, pathname, name):
|
||||
if not dir:
|
||||
|
|
Loading…
Reference in New Issue