Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/models/airtime/Common.php

@@ -1,19 +0,0 @@
-<?php
-
-class Common {    
-    
-    public static function setTimeInSub($row, $col, $time)
-    {
-          $class = get_class($row).'Peer';
-
-        $con = Propel::getConnection($class::DATABASE_NAME);
-
-        $sql = 'UPDATE '.$class::TABLE_NAME
-        . ' SET '.$col.' = :f1'
-        . ' WHERE ' .$class::ID. ' = :p1';
-        $stmt = $con->prepare($sql);
-        $stmt->bindValue(':f1', $time);
-        $stmt->bindValue(':p1', $row->getDbId());
-        $stmt->execute();
-    }
-}

airtime_mvc/public/index.php

@@ -63,6 +63,10 @@ try {
     }
 } catch (Exception $e) {
     echo $e->getMessage();
+    echo "<pre>";
+    echo $e->getTraceAsString();
+    echo "</pre>";
     Logging::info($e->getMessage());
+    Logging::info($e->getTraceAsString());
 }
 

python_apps/media-monitor2/media/monitor/airtime.py

@@ -54,6 +54,8 @@ class AirtimeNotifier(Loggable):
         message.ack()
         self.logger.info("Received md from RabbitMQ: %s" % str(body))
         m = json.loads(message.body)
+        # TODO : normalize any other keys that could be used to pass
+        # directories
         if 'directory' in m: m['directory'] = normpath(m['directory'])
         self.handler.message(m)
 
@@ -121,7 +123,6 @@ class AirtimeMessageReceiver(Loggable):
                     % md_path, e)
 
     def new_watch(self, msg, restart=False):
-        msg['directory'] = normpath(msg['directory'])
         self.logger.info("Creating watch for directory: '%s'" %
                 msg['directory'])
         if not os.path.exists(msg['directory']):
@@ -134,14 +135,14 @@ class AirtimeMessageReceiver(Loggable):
                         msg['directory'])
                 self.new_watch(msg)
         else:
-            self.__request_now_bootstrap( directory=msg['directory'],
+            self.__reFalsequest_now_bootstrap( directory=msg['directory'],
                     all_files=restart)
             self.manager.add_watch_directory(msg['directory'])
 
     def remove_watch(self, msg):
         self.logger.info("Removing watch from directory: '%s'" %
                 msg['directory'])
-        self.manager.remove_watch_directory(normpath(msg['directory']))
+        self.manager.remove_watch_directory(msg['directory'])
 
     def rescan_watch(self, msg):
         self.logger.info("Trying to rescan watched directory: '%s'" %
@@ -174,6 +175,8 @@ class AirtimeMessageReceiver(Loggable):
                     Out of curiousity we will print some details.")
             self.logger.info(msg)
             return
+        # TODO : Add validation that we are deleting a file that's under our
+        # surveillance. We don't to delete some random system file.
         if os.path.exists(msg['filepath']):
             try:
                 self.logger.info("Attempting to delete '%s'" %

python_apps/media-monitor2/mm2.py

@@ -113,7 +113,7 @@ def main(global_config, api_client_config, log_config,
                 log.error("Could not create watch directory: '%s' \
                         (given from the database)." % watch_dir)
         if os.path.exists(watch_dir):
-            airtime_receiver.new_watch({ 'directory':watch_dir })
+            airtime_receiver.new_watch({ 'directory':watch_dir }, restart=True)
 
     bs = Bootstrapper( db=sdb, watch_signal='watch' )