From 458089a7732f635d3a545d5f76c442922bd0e46f Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 11 Sep 2012 11:19:44 -0400
Subject: [PATCH 1/3] cc-4359: Fixed without breaking anything else. Reverted
 bootrsrapping to default operation except for media monitor restart which
 uses a special bootstrap that respects file_exists settings.

---
 python_apps/media-monitor2/media/monitor/airtime.py | 9 ++++++---
 python_apps/media-monitor2/mm2.py                   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py
index f6df354d4..1cd81b3dc 100644
--- a/python_apps/media-monitor2/media/monitor/airtime.py
+++ b/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'" %
diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor2/mm2.py
index a2f9bb7bd..17731cad8 100644
--- a/python_apps/media-monitor2/mm2.py
+++ b/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' )
 

From 9b0e5a6b2fe9dc2a09cfc47719750e29e036f8ee Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 11 Sep 2012 11:53:36 -0400
Subject: [PATCH 2/3] removing unused file.

---
 .../application/models/airtime/Common.php     | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 airtime_mvc/application/models/airtime/Common.php

diff --git a/airtime_mvc/application/models/airtime/Common.php b/airtime_mvc/application/models/airtime/Common.php
deleted file mode 100644
index 5845b2b29..000000000
--- a/airtime_mvc/application/models/airtime/Common.php
+++ /dev/null
@@ -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();
-    }
-}

From bcc095e9248c9aaa183685cf16e5bf81674e6436 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 11 Sep 2012 12:03:52 -0400
Subject: [PATCH 3/3] CC-4389: Convert all PHP errors to throw exceptions
 instead

-don't throw exception for suppressed errors.
---
 airtime_mvc/public/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index b6484a3cf..8bfa58136 100644
--- a/airtime_mvc/public/index.php
+++ b/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());
 }