Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
This commit is contained in:
commit
2fdb8d1deb
|
@ -67,10 +67,6 @@ class UpgradeController extends Zend_Controller_Action
|
||||||
$file = new SplFileObject($iniFile, "w");
|
$file = new SplFileObject($iniFile, "w");
|
||||||
$file->fwrite($beginning."\n".$newLines.$end);
|
$file->fwrite($beginning."\n".$newLines.$end);
|
||||||
|
|
||||||
|
|
||||||
//delete maintenance.txt to give users access back to Airtime
|
|
||||||
unlink($maintenanceFile);
|
|
||||||
|
|
||||||
//TODO: clear out the cache
|
//TODO: clear out the cache
|
||||||
|
|
||||||
$con->commit();
|
$con->commit();
|
||||||
|
@ -87,6 +83,8 @@ class UpgradeController extends Zend_Controller_Action
|
||||||
|
|
||||||
passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_upgrade_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
|
passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_upgrade_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
|
||||||
|
|
||||||
|
//delete maintenance.txt to give users access back to Airtime
|
||||||
|
unlink($maintenanceFile);
|
||||||
|
|
||||||
$this->getResponse()
|
$this->getResponse()
|
||||||
->setHttpResponseCode(200)
|
->setHttpResponseCode(200)
|
||||||
|
|
Loading…
Reference in New Issue