fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in julceslau/processmaker (pull request #891)

Browse Source 
Change message when the 'unify-database' commanda is executed in a workspace that already using one database
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-10 16:42:57 -04:00
parent dede571951 37e1ad781c
commit 255ff0e5e5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -196,9 +196,9 @@ function listFiles($dir) {
}
function run_unify_database($args)
{
{
$workspaces = array();
if (sizeof($args) > 2) {
$filename = array_pop($args);
foreach ($args as $arg) {
@@ -213,10 +213,10 @@ function run_unify_database($args)
CLI::logging("Checking workspaces...\n");
//setting flag to true to check into sysGeneric.php
$flag = G::isPMUnderUpdating(0);
//start to unify
$count = count($workspaces);
if ($count > 1) {
if(!Bootstrap::isLinuxOs()){
CLI::error("This is not a Linux enviroment, please especify workspace.\n");
@@ -228,16 +228,16 @@ function run_unify_database($args)
$errors = false;
$countWorkspace = 0;
$buildCacheView = array_key_exists("buildACV", $args);
foreach ($workspaces as $workspace) {
try {
foreach ($workspaces as $workspace) {
try {
$countWorkspace++;
if (! $workspace->workspaceExists()) {
echo "Workspace {$workspace->name} not found\n";
return false;
}
$ws = $workspace->name;
$sContent = file_get_contents (PATH_DB . $ws . PATH_SEP . 'db.php');
@@ -248,7 +248,7 @@ function run_unify_database($args)
}
if ($workspace->onedb) {
CLI::logging("Workspace $workspace->name already one Database...\n");
CLI::logging("The \"$workspace->name\" workspace already using one database...\n");
} else {
//create destination path
$parentDirectory = PATH_DATA . "upgrade";
@@ -265,18 +265,18 @@ function run_unify_database($args)
CLI::logging( "Exporting rb and rp databases to a temporal location...\n" );
$metadata["databases"] = $workspace->exportDatabase( $tempDirectory,true );
$metadata["version"] = 1;
list ($dbHost, $dbUser, $dbPass) = @explode( SYSTEM_HASH, G::decrypt( HASH_INSTALLATION, SYSTEM_HASH ) );
$link = mysql_connect( $dbHost, $dbUser, $dbPass );
foreach ($metadata['databases'] as $db) {
$dbName = 'wf_'.$workspace->name;
CLI::logging( "+> Restoring {$db['name']} to $dbName database\n" );
$aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass);
$restore = $workspace->executeScript( $dbName, "$tempDirectory/{$db['name']}.sql", $aParameters);
if ($restore) {
CLI::logging( "+> Remove {$db['name']} database\n" );
@@ -286,15 +286,15 @@ function run_unify_database($args)
}
}
}
CLI::logging( "Removing temporary files\n" );
G::rm_dir( $tempDirectory );
$newDBNames = $workspace->resetDBInfo( $dbHost, true, true );
CLI::logging( CLI::info( "Done restoring databases" ) . "\n" );
}
} catch (Exception $e) {
}
} catch (Exception $e) {
CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
$errors = true;
}