revert sessions directory and update messages

Signed-off-by: Ubuntu <faiz@faiz1234.qxtipznhomuelnqzqjon0ldwid.xx.internal.cloudapp.net>
This commit is contained in:
Ubuntu 2018-12-15 12:56:34 +00:00
Родитель a84f8363ae
Коммит c966f0a7d4
6 изменённых файлов: 28 добавлений и 17 удалений

3
.gitignore поставляемый
Просмотреть файл

@ -23,5 +23,4 @@ nytprof.out
*.tar.gz
*.tar
*-junk*
Azure-Apache-Migration-Tool/
/.sessions/
Azure-Apache-Migration-Tool/

Просмотреть файл

@ -341,7 +341,7 @@ sub auth_createSessionDirectory
$migrationStatus='';
$returnCreateSuccess=0;
$sessionFilename= "./$sessionName/$sessionFilename"; #appended with the full path
$sessionFilename= "./sessions/$sessionName/$sessionFilename"; #appended with the full path
$DIRHANDLE= new IO::Dir ".";
if(opendir (DIRHANDLE,$sessionName))
{

Просмотреть файл

@ -28,8 +28,8 @@ use constant REDHAT2 => "Redhat";
use constant MANDRAKE => "Mandrake";
use constant APACHE => "Apache";
use constant PROTOCOL => "tcp";
use constant TITLE1 => " \t\tApache to Azure App Service Migration Tool\t\n";
use constant TITLE2 => "\t\tCopyright MICROSOFT CORPORATION Version 1.0 \t\n";
use constant TITLE1 => " \t\tApache to Azure App Service Apache Migration Tool\t\n";
use constant TITLE2 => "\t\tCopyright MICROSOFT CORPORATION Version 1.1 \t\n";
use constant TITLE3 =>
"
@ -42,7 +42,11 @@ System Requirements:
2. Administrative knowledge of the running Website(s)
(e.g.:httpd.conf file path)
More Information: Visit http://www.movemetothecloud.net/
More Information: Visit http://www.movemetothecloud.net/LinuxMigration
Remember to periodically update the tool from the above site.
For support please open a ticket at : https://github.com/Azure/Azure-Apache-Migration-Tool/issues
Important Notes:
Super User rights are required to use the Apache to Azure App Service Migration Tool.\n";
@ -57,7 +61,15 @@ use constant TITLE_SESSION_NAME =>
store temporary files which may contain sensitive information and
should be deleted when this tool is finished running.";
use constant TITLE_EXIT => "\n\nThank You for using Apache to Azure App Service Migration Tool\n";
use constant TITLE_EXIT => "\n\n
---------------------------------------------------------------------------
For more information: Visit http://www.movemetothecloud.net/LinuxMigration\n
Remember to periodically update the tool from the above site.\n
For support please open a ticket at : https://github.com/Azure/Azure-Apache-Migration-Tool/issues\n
Thank You for using Apache to Azure App Service Migration Tool\n
---------------------------------------------------------------------------\n\n";
use constant SUCCESS => "1000";
#*****************************************************************************#
@ -470,7 +482,7 @@ use constant RECOVERY_MODE_1 => "WSMKREC1";
use constant RECOVERY_MODE_2 => "WSMKREC2";
use constant RECOVERY_MODE_3 => "WSMKREC3";
use constant RECOVERY_MODE_COMPLETE => "WSMKREC3";
use constant TASKLIST_DELIM => "|"; # old value"²";
use constant TASKLIST_DELIM => "|"; # old value"<EFBFBD>";
use constant L_TIME_LAPSE => 30;
use constant CLEANUP_AND_EXIT => "EXIT_TOOL_NOW";
use constant MIME_TYPES_FILE => "mime.types";

Просмотреть файл

@ -71,7 +71,7 @@ my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
#get session name
my $strSessionName = &ilog_getSessionName();
#form the complete working folder
my $workingFolder = $strCurWorkingFolder . '/.sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
#----------------------------------------------------------------------------------------------------------------------
$siteIndex[0] = 'SITENAME';
@ -409,7 +409,7 @@ sub pars_UploadPublishSettingsAllSites
ilog_setLogInformation('INT_INFO',$recoveryFile,MSG_FILE_CLOSE,'');
}
ilog_print(1,"\nThanks for using the Apache to Azure App Service Migration Tool! \n");
ilog_print(1, dTITLE_EXIT);
return 0;
}
@ -454,7 +454,7 @@ sub pars_PublishSite
my $mySqlConnectionString;
my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
my $strSessionName = &ilog_getSessionName();
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
while (!$publishSuccess)
{
@ -761,7 +761,7 @@ sub getConfigFiles
my $lineNotMatch = $_[2];
my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
my $strSessionName = &ilog_getSessionName();
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
my @files = @{$_[3]};
@ -895,7 +895,7 @@ sub deployToSite
my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
my $strSessionName = &ilog_getSessionName();
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
my $zipLocation = "$workingFolder/site-content.zip";
if ( $zip->writeToFileNamed($zipLocation) != AZ_OK )
{
@ -2178,7 +2178,7 @@ sub pars_siteHasValidFrameworkDb
my $dbHost;
my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
my $strSessionName = &ilog_getSessionName();
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
if ($framework eq WORDPRESS)
{

Просмотреть файл

@ -280,7 +280,7 @@ sub utf_getWorkingFolder
#get session name
my $strSessionName = &ilog_getSessionName();
#form the complete working folder
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
return $workingFolder;
}

Просмотреть файл

@ -69,7 +69,7 @@ eval
# get session name
my $strSessionName = &ilog_getSessionName();
# form the complete working folder
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
# change local dir
my $retwrk_changeLocalDir = wrk_changeLocalDir($workingFolder);
if (!($retwrk_changeLocalDir))
@ -157,7 +157,7 @@ my $strCurWorkingFolder = &utf_getCurrentWorkingFolder();
#get session name
my $strSessionName = &ilog_getSessionName();
#form the complete working folder
my $workingFolder = $strCurWorkingFolder . '/sessions/' . $strSessionName;
my $workingFolder = $strCurWorkingFolder . '/' . $strSessionName;
while($strYesOrNo!~/^\s*[YynN]\s*$/)
{