Merge pull request #131 from cyberious/MOD-2403

ferventcoder · ferventcoder · commit ba434a342f8e · 2015-08-14T12:42:24.000-05:00
(MODULES-2403) Improve error handling for sqlserver_tsql
diff --git a/lib/puppet/provider/sqlserver_tsql/mssql.rb b/lib/puppet/provider/sqlserver_tsql/mssql.rb
@@ -19,7 +19,7 @@ def get_config
         resc.original_parameters[:instance_name] =~ /#{instance}/i
     }
     if config_resc.nil?
-      fail("Sqlserver_tsql #{resource[:title]} was unable to retrieve the config for the instance #{resource[:instance]}")
+      fail("Sqlserver_tsql[#{resource.title}] was unable to retrieve the config, please ensure the catalog contains sqlserver::config{'#{resource[:instance]}':}")
     end
 
     config_resc.original_parameters

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def get_config`
`19`	`19`	`resc.original_parameters[:instance_name] =~ /#{instance}/i`
`20`	`20`	`}`
`21`	`21`	`if config_resc.nil?`
`22`		`- fail("Sqlserver_tsql #{resource[:title]} was unable to retrieve the config for the instance #{resource[:instance]}")`
	`22`	`+ fail("Sqlserver_tsql[#{resource.title}] was unable to retrieve the config, please ensure the catalog contains sqlserver::config{'#{resource[:instance]}':}")`
`23`	`23`	`end`
`24`	`24`
`25`	`25`	`config_resc.original_parameters`