Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Commit 58cb84e

Browse files
smortexevgeni
authored andcommitted
Remove stdlib's legacy function usage
1 parent eafe2c8 commit 58cb84e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

manifests/config/global.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class rsyslog::config::global {
22
#create a hash just with legacy type values
3-
$legacytype = $rsyslog::config::global_config.filter |$key, $value| { has_key( $value, 'type') }
3+
$legacytype = $rsyslog::config::global_config.filter |$key, $value| { 'type' in $value }
44

55
$legacytype.each |$param, $config| {
66
rsyslog::component::global_config { $param:
@@ -13,7 +13,7 @@
1313
}
1414

1515
#create a hash just with the non legacy type value
16-
$newtype = $rsyslog::config::global_config.filter |$key, $value| { ! has_key( $value, 'type') }
16+
$newtype = $rsyslog::config::global_config.filter |$key, $value| { ! 'type' in $value }
1717

1818
#flatten the nested hash of hashes to one single hash
1919
$flattendata = $newtype.keys.reduce({}) |$memo, $key| { $memo + { $key => $newtype[$key]["value"] } }

templates/action.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ action(type="<%= $type %>"
2626
<%}-%>
2727
<% if $config { -%>
2828
<% $config.each |$k, $v| { -%>
29-
<%- if is_array($v) { -%>
29+
<%- if $v =~ Array { -%>
3030
<%= $k %>=<%= join(["[\"", join($v, '", "'), "\"]"], "") %>
3131
<%- } else { -%>
3232
<%= $k %>="<%= $v %>"

0 commit comments

Comments
 (0)