Merge pull request #116 from paliarush/Improved-Error-Reporting

paliarush · web-flow · commit 0f6809572441 · 2016-12-22T12:33:27.000-06:00
Improve error reporting #112
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ Software listed below should be available in [PATH](https://en.wikipedia.org/wik
 
  1. Open terminal and change directory to the one which you want to contain Magento project. ![](docs/images/windows-icon.png) On Windows use Git Bash, which is available after Git installation
 
- 1. Download project with Vagrant configuration:
+ 1. Download project with Vagrant configuration. :warning: Do not open it in PhpStorm until `init_project.sh` has completed PhpStorm configuration:
 
    ```
    git clone git@github.com:paliarush/magento2-vagrant-for-developers.git vagrant-magento
diff --git a/init_project.sh b/init_project.sh
@@ -242,4 +242,4 @@ if [[ ${host_os} == "Windows" ]] || [[ ${use_nfs} == 0 ]]; then
     If not using PhpStorm, you can set up synchronization using rsync"
 fi
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set debug:vagrant_project to 1 in config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-bin-magento b/m-bin-magento
@@ -20,4 +20,4 @@ vagrant ssh -c "\$MAGENTO_ROOT/bin/magento $arguments" 2> >(logError)
 # To debug, comment out line above and uncomment line below
 # vagrant ssh -c "php -d xdebug.remote_autostart=1 \$MAGENTO_ROOT/bin/magento $arguments" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-clear-cache b/m-clear-cache
@@ -32,4 +32,4 @@ else
     info "Use 'bash ./m-clear-cache -w' to get automatic cache warm up"
 fi
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-composer b/m-composer
@@ -16,4 +16,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_composer.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-reinstall b/m-reinstall
@@ -16,4 +16,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_reinstall.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-search-engine b/m-search-engine
@@ -17,4 +17,4 @@ fi
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-search-engine ${@}" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-switch-to-ce b/m-switch-to-ce
@@ -16,4 +16,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_switch_to_ce.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-switch-to-ee b/m-switch-to-ee
@@ -16,4 +16,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_switch_to_ee.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/m-varnish b/m-varnish
@@ -17,4 +17,4 @@ fi
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-varnish ${@}" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"
+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"
diff --git a/scripts/guest/m-reinstall b/scripts/guest/m-reinstall
@@ -86,6 +86,11 @@ php ${install_cmd} 2> >(logError) > >(log)
 # Comment out the line above and uncomment the one below to debug Magento Setup script
 # php -d xdebug.remote_autostart=1 ${install_cmd} 2> >(logError) > >(log)
 
+if [[ $? != 0 ]]; then
+    error "Magento installation failed."
+    exit 1
+fi
+
 bash "${vagrant_dir}/scripts/guest/configure_varnish" -f
 
 status "Enabling Magento cron jobs"
diff --git a/scripts/host/check_mounted_directories.sh b/scripts/host/check_mounted_directories.sh
@@ -12,3 +12,5 @@ if [[ ! -f "${vagrant_dir}/etc/guest/mysql/my.cnf" ]]; then
     exit 1
 fi
 vagrant ssh -c "bash /vagrant/scripts/guest/check_mounted_directories" 2> >(logError)
+# Explicit exit is necessary to bypass incorrect output from vagrant in case of errors
+exit 0
diff --git a/scripts/host/m_clear_cache.sh b/scripts/host/m_clear_cache.sh
@@ -6,3 +6,5 @@ source "${vagrant_dir}/scripts/output_functions.sh"
 
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-clear-cache" 2> >(logError)
+# Explicit exit is necessary to bypass incorrect output from vagrant in case of errors
+exit 0
diff --git a/scripts/host/m_reinstall.sh b/scripts/host/m_reinstall.sh
@@ -6,3 +6,5 @@ source "${vagrant_dir}/scripts/output_functions.sh"
 
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-reinstall" 2> >(logError)
+# Explicit exit is necessary to bypass incorrect output from vagrant in case of errors
+exit 0
diff --git a/scripts/host/warm_up_cache.sh b/scripts/host/warm_up_cache.sh
@@ -6,3 +6,5 @@ source "${vagrant_dir}/scripts/output_functions.sh"
 
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/warm_up_cache" 2> >(logError)
+# Explicit exit is necessary to bypass incorrect output from vagrant in case of errors
+exit 0

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ fi`
`16`	`16`
`17`	`17`	`bash "${vagrant_dir}/scripts/host/m_composer.sh" "$@" 2> >(logError)`
`18`	`18`
`19`		`-info "See detailed log in '${vagrant_dir}/log/${current_script_name}.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"`
	`19`	`+info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"`