Skip to content

Commit 0408848

Browse files
authored
Merge pull request #893 from DavidS/mysql-datadir-logging
Cleanup debug logging from the mysql_datadir provider
2 parents 53044aa + 9a9772a commit 0408848

File tree

1 file changed

+3
-3
lines changed
  • lib/puppet/provider/mysql_datadir

1 file changed

+3
-3
lines changed

lib/puppet/provider/mysql_datadir/mysql.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ def create
4141
end
4242
4343
if mysqld_version.nil?
44-
debug("Installing MySQL data directory with mysql_install_db #{defaults_extra_file} --basedir=#{basedir} --datadir=#{datadir} --user=#{user}")
44+
debug("Installing MySQL data directory with mysql_install_db #{opts.compact.join(" ")}")
4545
mysql_install_db(opts.compact)
4646
else
4747
if (mysqld_type == "mysql" or mysqld_type == "percona") and Puppet::Util::Package.versioncmp(mysqld_version, '5.7.6') >= 0
48-
debug("Initializing MySQL data directory >= 5.7.6 with 'mysqld #{defaults_extra_file} #{initialize} --basedir=#{basedir} --datadir=#{datadir} --user=#{user}'")
4948
opts<<"--log-error=#{log_error}"
5049
opts<<"#{initialize}"
50+
debug("Initializing MySQL data directory >= 5.7.6 with mysqld: #{opts.compact.join(" ")}")
5151
mysqld(opts.compact)
5252
else
53-
debug("Installing MySQL data directory with mysql_install_db #{defaults_extra_file} --basedir=#{basedir} --datadir=#{datadir} --user=#{user}")
53+
debug("Installing MySQL data directory with mysql_install_db #{opts.compact.join(" ")}")
5454
mysql_install_db(opts.compact)
5555
end
5656
end

0 commit comments

Comments
 (0)