Merge pull request #2397 from igt-marcin-wasilewski/main

Ramesh7 · web-flow · commit ab456551a594 · 2023-09-20T17:29:29.000+05:30
strickter loglevel syntax verification
diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
@@ -10,6 +10,7 @@
     'warn mod_ssl.c:info',
     'warn ssl_module:info',
     'trace4',
+    'ssl:info',
   ].each do |allowed_value|
     it { is_expected.to allow_value(allowed_value) }
   end
@@ -19,6 +20,8 @@
     '',
     [],
     ['info'],
+    'thisiswarning',
+    'errorerror',
   ].each do |invalid_value|
     it { is_expected.not_to allow_value(invalid_value) }
   end
diff --git a/types/loglevel.pp b/types/loglevel.pp
@@ -24,4 +24,4 @@
 # * `trace8`
 #
 # @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
-type Apache::LogLevel = Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+type Apache::LogLevel = Pattern[/\A([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])(\s+([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8]))*\Z/]

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@`
`24`	`24`	# * `trace8`
`25`	`25`	`#`
`26`	`26`	`# @see https://httpd.apache.org/docs/current/mod/core.html#loglevel`
`27`		`-type Apache::LogLevel = Pattern[/(emerg\|alert\|crit\|error\|warn\|notice\|info\|debug\|trace[1-8])/]`
	`27`	`+type Apache::LogLevel = Pattern[/\A([a-z_\.]+:)?(emerg\|alert\|crit\|error\|warn\|notice\|info\|debug\|trace[1-8])(\s+([a-z_\.]+:)?(emerg\|alert\|crit\|error\|warn\|notice\|info\|debug\|trace[1-8]))*\Z/]`