Merge pull request #678 from hunner/fix_logerror

(MODULES-1804) Allow override of log-error
xbezdick · Feb 27, 2015 · 7eea731 · 7eea731
2 parents 037d30d + ce43899
commit 7eea731
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -1,5 +1,6 @@
 #
 class mysql::server::service {
+  $options = $mysql::server::options
 
   if $mysql::server::real_service_manage {
     if $mysql::server::real_service_enabled {
@@ -9,7 +10,7 @@
     }
   }
 
-  file { $mysql::params::log_error:
+  file { $options['mysqld']['log-error']:
     ensure => present,
     owner  => 'mysql',
     group  => 'mysql',

diff --git a/spec/classes/mysql_server_spec.rb b/spec/classes/mysql_server_spec.rb
@@ -45,6 +45,10 @@
               })
             end
           end
+          context 'with log-error overridden' do
+            let(:params) {{ :override_options => { 'mysqld' => { 'log-error' => '/tmp/error.log' }} }}
+            it { is_expected.to contain_file('/tmp/error.log') }
+          end
         end
 
         context 'mysql::server::root_password' do