Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
martin 2011-10-04 14:01:48 -04:00
parent 5190a0c24c 109bd5d044
commit cb3060623c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/LibraryController.php
View File

@ -219,6 +219,7 @@ class LibraryController extends Zend_Controller_Action
Logging::log($data['MDATA_KEY_FILEPATH']); Logging::log($data['MDATA_KEY_FILEPATH']);
Application_Model_RabbitMq::SendMessageToMediaMonitor("md_update", $data); Application_Model_RabbitMq::SendMessageToMediaMonitor("md_update", $data);
$this->_helper->redirector('index'); $this->_helper->redirector('index');
} }
} }

4
install_minimal/include/airtime-install.php
View File

@ -129,9 +129,9 @@ AirtimeInstall::InstallStorageDirectory();
if ($db_install) { if ($db_install) {
if($newInstall) { 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. // 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); AirtimeInstall::DbConnect(true);
} else { } else {
require_once('airtime-db-install.php'); require_once('airtime-db-install.php');

2
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View File

@ -38,7 +38,6 @@ class AirtimeProcessEvent(ProcessEvent):
self.api_client = api_client self.api_client = api_client
self.create_dict = {} self.create_dict = {}
def add_filepath_to_ignore(self, filepath): def add_filepath_to_ignore(self, filepath):
self.ignore_event.add(filepath) self.ignore_event.add(filepath)
@ -110,7 +109,6 @@ class AirtimeProcessEvent(ProcessEvent):
# detele corresponding entry from create_dict # detele corresponding entry from create_dict
self.create_dict.pop(event.pathname) self.create_dict.pop(event.pathname)
self.handle_created_file(event.dir, event.pathname, event.name) self.handle_created_file(event.dir, event.pathname, event.name)
def handle_created_file(self, dir, pathname, name): def handle_created_file(self, dir, pathname, name):
if not dir: if not dir: