diff --git a/src/core/mysql b/src/core/mysql index 0d07ab1..d698af1 100644 --- a/src/core/mysql +++ b/src/core/mysql @@ -94,7 +94,7 @@ print_mysql_innodb_status() { log INFO "Ended 'mysql innodb' report" } -# Print the output of "mysqladmin [full] processlist" to the mysql file +# Print the output of "mysql [full] processlist" to the mysql file print_mysql_procs() { local LOGFILE="$1" local MYCNF="$2" diff --git a/src/recap b/src/recap index 79d717e..c8f8321 100755 --- a/src/recap +++ b/src/recap @@ -372,13 +372,12 @@ run_mysql_report() { print_mysql "${ITEM_FILE}" "${MYCNF}" # check to see if the optional mysql process list should be generated - if [[ "${USEMYSQLPROCESSLIST,,}" == "yes" ]]; then - print_blankline "${ITEM_FILE}" - print_mysql_procs "${ITEM_FILE}" "${MYCNF}" - fi if [[ "${USEMYSQLFULLPROCESSLIST,,}" == "yes" ]]; then print_blankline "${ITEM_FILE}" print_mysql_procs "${ITEM_FILE}" "${MYCNF}" "FULL" + elif [[ "${USEMYSQLPROCESSLIST,,}" == "yes" ]]; then + print_blankline "${ITEM_FILE}" + print_mysql_procs "${ITEM_FILE}" "${MYCNF}" fi if [[ "${USEINNODB,,}" == "yes" ]]; then # send df -h output to output file diff --git a/src/recap.conf.5 b/src/recap.conf.5 index f5cd922..755b48d 100644 --- a/src/recap.conf.5 +++ b/src/recap.conf.5 @@ -120,7 +120,7 @@ Can be set to yes or no depending on whether or not the output of "mysqladmin pr .IP \fBUSEMYSQLFULLPROCESSLIST\fR .br -Can be set to yes or no depending on whether or not the output of "mysqladmin -v processlist" command should be recorded. This report requires that USEMYSQL be set to "yes". This option makes use of MYSQL_PROCESS_LIST, to produce the output vertical or in a table. This output is written in +Can be set to yes or no depending on whether or not the output of "mysqladmin -v processlist" command should be recorded. This report requires that USEMYSQL be set to "yes". This option takes priority over USEMYSQLPROCESSLIST. This option makes use of MYSQL_PROCESS_LIST, to produce the output vertical or in a table. This output is written in .IR ${BASEDIR}/mysql.log (default: no)