From ee92c5cfb42321c353468cd0cd90c3d76d6c02fb Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 29 Jun 2011 10:46:46 +0200 Subject: [PATCH 1/4] cc-1799 : Filesystem notifier doesn't need to be made a daemon. --- python_apps/media-monitor/MediaMonitor.py | 8 ++------ .../media-monitor/install/media-monitor-uninstall.py | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index 086366b52..172af7f6a 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -18,10 +18,6 @@ def handleSigTERM(signum, frame): p.terminate() logger.info("Killed process. %d", p.pid) - notifier_daemon_pid = open('/var/run/airtime-notifier.pid', 'r').read() - os.kill(int(notifier_daemon_pid), 9) - logger.info("Killed process. %d", int(notifier_daemon_pid)) - sys.exit(0) @@ -65,8 +61,8 @@ try: logger.info("Added watch to %s", storage_directory) logger.info("wdd result %s", wdd[storage_directory]) - notifier.loop(daemonize=True, callback=pe.notifier_loop_callback, pid_file='/var/run/airtime-notifier.pid', stdout='/var/log/airtime/media-monitor/media-monitor.log') - + notifier.loop(callback=pe.notifier_loop_callback) + for p in processes: p.join() diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index 97d3bf084..1c102f582 100755 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -29,7 +29,6 @@ try: os.system("/etc/init.d/airtime-media-monitor stop") os.system("rm -f /etc/init.d/airtime-media-monitor") - os.system("rm -f /var/run/airtime-notifier.pid") os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1") print "Removing log directories" From c300b8f36dc46a37117ec6bbecfe60ce677cd644 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 29 Jun 2011 14:32:17 +0200 Subject: [PATCH 2/4] CC-2279 : Upgrade script for converting stor directory to new format correcting paths for doctrine migrations, generating my db file. --- dev_tools/gen_doctrine_migration.php | 2 +- .../Version20110629143017.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 install/DoctrineMigrations/Version20110629143017.php diff --git a/dev_tools/gen_doctrine_migration.php b/dev_tools/gen_doctrine_migration.php index 2e9791f30..4799eb2fc 100644 --- a/dev_tools/gen_doctrine_migration.php +++ b/dev_tools/gen_doctrine_migration.php @@ -5,5 +5,5 @@ */ $dir = __DIR__; - $command = "php $dir/../library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install/DoctrineMigrations/migrations.xml --db-configuration=$dir/../library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate"; + $command = "php $dir/../airtime_mvc/library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install/DoctrineMigrations/migrations.xml --db-configuration=$dir/../airtime_mvc/library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate"; system($command); diff --git a/install/DoctrineMigrations/Version20110629143017.php b/install/DoctrineMigrations/Version20110629143017.php new file mode 100644 index 000000000..e2d77ddca --- /dev/null +++ b/install/DoctrineMigrations/Version20110629143017.php @@ -0,0 +1,19 @@ + Date: Wed, 29 Jun 2011 18:53:19 +0200 Subject: [PATCH 3/4] cc-2279 : Upgrade script start of doctrine upgrade script for 1.9 music dirs change. --- .../Version20110629143017.php | 20 ++++++++++++- .../upgrades/airtime-1.9/airtime-upgrade.php | 28 +++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/install/DoctrineMigrations/Version20110629143017.php b/install/DoctrineMigrations/Version20110629143017.php index e2d77ddca..273bb503e 100644 --- a/install/DoctrineMigrations/Version20110629143017.php +++ b/install/DoctrineMigrations/Version20110629143017.php @@ -1,5 +1,7 @@ createTable('cc_music_dirs'); + $cc_music_dirs->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true)); + $cc_music_dirs->addColumn('type', 'string', array('length' => 255)); + $cc_music_dirs->addColumn('directory', 'text', array('unique' => true)); + + $cc_music_dirs->setPrimaryKey(array('id')); + //end create cc_music_dirs table + + + //start cc_files modifications + $cc_files = $schema->getTable('cc_files'); + $cc_files->addColumn('directory', 'integer'); + + $cc_files->addNamedForeignKeyConstraint('cc_music_dirs_folder_fkey', $cc_music_dirs, array('directory'), array('id'), array('onDelete' => 'CASCADE')); + //end cc_files modifications } public function down(Schema $schema) { } -} \ No newline at end of file +} diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php index 51ab6091b..8dd265a15 100644 --- a/install/upgrades/airtime-1.9/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9/airtime-upgrade.php @@ -16,12 +16,34 @@ AirtimeInstall::CreateZendPhpLogFile(); const CONF_DIR_BINARIES = "/usr/lib/airtime"; const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; +function BypassMigrations($version) +{ + $appDir = __DIR__."/../../airtime_mvc"; + $dir = __DIR__; + $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". + "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". + "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". + "--no-interaction --add migrations:version $version"; + system($command); +} + +function MigrateTablesToVersion($version) +{ + $appDir = __DIR__."/../../airtime_mvc"; + $dir = __DIR__; + $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". + "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". + "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". + "--no-interaction migrations:migrate $version"; + system($command); +} + function InstallPhpCode($phpDir) { global $CC_CONFIG; - + $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc'); - + echo "* Installing PHP code to ".$phpDir.PHP_EOL; exec("mkdir -p ".$phpDir); exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir); @@ -30,7 +52,7 @@ function InstallPhpCode($phpDir) function InstallBinaries() { $utilsSrc = __DIR__."/../../../utils"; - + echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL; exec("mkdir -p ".CONF_DIR_BINARIES); exec("cp -R ".$utilsSrc." ".CONF_DIR_BINARIES); From 9a7025b4ac4196864b74e12514f0657f6a022b99 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 29 Jun 2011 13:47:50 -0400 Subject: [PATCH 4/4] -change airtime-dev.sourcefabric.org to localhost in widgets sample page -tabs now default to the current day --- widgets/sample_page.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/widgets/sample_page.html b/widgets/sample_page.html index a83828ee8..889d457cd 100644 --- a/widgets/sample_page.html +++ b/widgets/sample_page.html @@ -12,22 +12,23 @@